From mprivozn at redhat.com  Fri Jul  1 07:43:16 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  1 Jul 2022 09:43:16 +0200
Subject: [PATCH for 8.5.0] qemu_hotplug: Don't skip cleanup in
 qemuDomainAttachNetDevice()
Message-ID: <50e87a993457e5717baedd6b504fa153c82536c8.1656661372.git.mprivozn@redhat.com>

Introduced in v8.4.0-rc1~183 but the first real problem
introduced in v8.4.0-rc1~170, there's a
qemuBuildInterfaceConnect() call inside of
qemuDomainAttachNetDevice(). If the former fails, then the
function is immediately returned from instead of jumping onto the
cleanup label. This is crucial, because at this point the domain
definition contains 'borrowed' net definition, which is then
freed, since an error was met. The domain definition is then left
with a dangling pointer which leads to all sorts of different
crashes.

Fixes: 29d022b1eb7b2330ed224a08509e6d3a5eeecc53
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2102009
Signed-off-by: Michal Privoznik <mprivozn at 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 ee44649d48..27e68370cf 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1265,7 +1265,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
     VIR_APPEND_ELEMENT_COPY(vm->def->nets, vm->def->nnets, net);
 
     if (qemuBuildInterfaceConnect(vm, net, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0)
-         return -1;
+        goto cleanup;
 
     iface_connected = true;
 
-- 
2.35.1


From jdenemar at redhat.com  Fri Jul  1 08:43:16 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 1 Jul 2022 10:43:16 +0200
Subject: [PATCH for 8.5.0] qemu_hotplug: Don't skip cleanup in
 qemuDomainAttachNetDevice()
In-Reply-To: <50e87a993457e5717baedd6b504fa153c82536c8.1656661372.git.mprivozn@redhat.com>
References: <50e87a993457e5717baedd6b504fa153c82536c8.1656661372.git.mprivozn@redhat.com>
Message-ID: <Yr6zpFst7bArlm3L@orkuz.int.mamuti.net>

On Fri, Jul 01, 2022 at 09:43:16 +0200, Michal Privoznik wrote:
> Introduced in v8.4.0-rc1~183 but the first real problem
> introduced in v8.4.0-rc1~170, there's a
> qemuBuildInterfaceConnect() call inside of
> qemuDomainAttachNetDevice(). If the former fails, then the
> function is immediately returned from instead of jumping onto the
> cleanup label. This is crucial, because at this point the domain
> definition contains 'borrowed' net definition, which is then
> freed, since an error was met. The domain definition is then left
> with a dangling pointer which leads to all sorts of different
> crashes.
> 
> Fixes: 29d022b1eb7b2330ed224a08509e6d3a5eeecc53
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2102009
> Signed-off-by: Michal Privoznik <mprivozn at 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 ee44649d48..27e68370cf 100644
> --- a/src/qemu/qemu_hotplug.c
> +++ b/src/qemu/qemu_hotplug.c
> @@ -1265,7 +1265,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
>      VIR_APPEND_ELEMENT_COPY(vm->def->nets, vm->def->nnets, net);
>  
>      if (qemuBuildInterfaceConnect(vm, net, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0)
> -         return -1;
> +        goto cleanup;
>  
>      iface_connected = true;
>  

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

From mprivozn at redhat.com  Fri Jul  1 08:50:01 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 1 Jul 2022 10:50:01 +0200
Subject: [PATCH for 8.5.0] qemu_hotplug: Don't skip cleanup in
 qemuDomainAttachNetDevice()
In-Reply-To: <Yr6zpFst7bArlm3L@orkuz.int.mamuti.net>
References: <50e87a993457e5717baedd6b504fa153c82536c8.1656661372.git.mprivozn@redhat.com>
 <Yr6zpFst7bArlm3L@orkuz.int.mamuti.net>
Message-ID: <4f686403-fd31-dbb3-4ed5-c7b18bd3c8ef@redhat.com>

On 7/1/22 10:43, Jiri Denemark wrote:
> On Fri, Jul 01, 2022 at 09:43:16 +0200, Michal Privoznik wrote:
>> Introduced in v8.4.0-rc1~183 but the first real problem
>> introduced in v8.4.0-rc1~170, there's a
>> qemuBuildInterfaceConnect() call inside of
>> qemuDomainAttachNetDevice(). If the former fails, then the
>> function is immediately returned from instead of jumping onto the
>> cleanup label. This is crucial, because at this point the domain
>> definition contains 'borrowed' net definition, which is then
>> freed, since an error was met. The domain definition is then left
>> with a dangling pointer which leads to all sorts of different
>> crashes.
>>
>> Fixes: 29d022b1eb7b2330ed224a08509e6d3a5eeecc53
>> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2102009
>> Signed-off-by: Michal Privoznik <mprivozn at 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 ee44649d48..27e68370cf 100644
>> --- a/src/qemu/qemu_hotplug.c
>> +++ b/src/qemu/qemu_hotplug.c
>> @@ -1265,7 +1265,7 @@ qemuDomainAttachNetDevice(virQEMUDriver *driver,
>>      VIR_APPEND_ELEMENT_COPY(vm->def->nets, vm->def->nnets, net);
>>  
>>      if (qemuBuildInterfaceConnect(vm, net, VIR_NETDEV_VPORT_PROFILE_OP_CREATE) < 0)
>> -         return -1;
>> +        goto cleanup;
>>  
>>      iface_connected = true;
>>  
> 
> Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
> 

Merged, thanks.

Michal


From jdenemar at redhat.com  Fri Jul  1 09:31:13 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri,  1 Jul 2022 11:31:13 +0200 (CEST)
Subject: Release of libvirt-8.5.0
Message-ID: <20220701093113.48900180138@rein.int.mamuti.net>

The 8.5.0 release of both libvirt and libvirt-python is tagged and
signed tarballs and source RPMs are available at

    https://libvirt.org/sources/
    https://libvirt.org/sources/python/

Thanks everybody who helped with this release by sending patches,
reviewing, testing, or providing feedback. Your work is greatly
appreciated.

* New features

  * qemu: Introduce support for network backed NVRAM

    Users can now use remote store NVRAM image by specifying newly introduced
    attribute `type='network'` with `<nvram>` element.

  * qemu: Add support for post-copy migration recovery

    A new ``VIR_MIGRATE_POSTCOPY_RESUME`` flag (``virsh migrate --postcopy-resume``)
    was introduced for recovering from a failed post-copy migration.

  * Introduce thread_pool_min and thread_pool_max attributes to IOThread

    New attributes ``thread_pool_min`` and ``thread_pool_max`` were introduced
    to ``<iothread/>`` as well as new ``<defaultiothread/>`` element with the
    same attributes. This way it's possible to instruct QEMU to spawn enough
    worker threads for an IOThread upfront, resulting in predictable time
    needed to process an I/O request.

* Improvements

  * Define a TFTP server without a DHCP server in network configuration

    It's now possible to define a network with no DHCP server but with a TFTP
    server. This may be useful when DHCP service is provided by other entity on
    the network than libvirt spawned dnsmasq.

* Bug fixes

  * qemu: Restore label to temp file in qemuDomainScreenshot()

    When virDomainScreenshot() is called, libvirt instructs QEMU to save the
    screenshot into a temporary file. This file needs to be labelled correctly,
    so that QEMU can access it. And since the file is temporary (it's deleted
    after the screenshot was taken) the corresponding label restore was
    missing. This proven to be problematic for profile based models, like
    AppArmor, where the temporary files were added into the profile but never
    removed, which resulted in longer profile recalculation times.

  * qemuBuildInterfaceConnect: Initialize @tapfd array

    Due to an uninitialized array, unsuccessful attempt to start a guest with
    an ``<interface/>`` might have resulted in closing of a random FD and thus
    sudden disconnect of a client or other random failures.

  * qemu: Fix hotplug of network interfaces

    A logic bug introduced in a recent refactor was fixed. The bug caused a
    problem when hot-adding a network interface, which failed with the
    following error::

      error: internal error: unable to execute QEMU command 'netdev_add': File descriptor named '(null)' has not been found

  * Fix ``startupPolicy`` validation for ``block`` disks

    Setting of ``startupPolicy`` for a block disk would result in an error due
    to a logic bug in a recent refactor.

  * qemu: Fix crash when overriding device properties via ``<qemu:override>`` element

    Adding an override for a device property would result in a crash of the qemu
    driver.

Enjoy.

Jirka

From mprivozn at redhat.com  Fri Jul  1 12:54:04 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 1 Jul 2022 14:54:04 +0200
Subject: [PATCH] security_selinux.c: Relabel existing mode="bind" UNIX
 sockets
In-Reply-To: <871qv9ezmi.fsf@bigbadwolfsecurity.com>
References: <871qv9ezmi.fsf@bigbadwolfsecurity.com>
Message-ID: <d6de24e8-d70d-68e4-4035-f78ae8345552@redhat.com>

On 6/28/22 14:33, David Michael wrote:
> This supports sockets created by libvirt and passed by FD using the
> same method as in security_dac.c.
> 
> Signed-off-by: David Michael <david at bigbadwolfsecurity.com>
> ---
> 
> Hi,
> 
> Custom SELinux labels are not applied to sockets when they have
> mode="bind", but other security models (DAC) allow changing these
> sockets.  Can the same method be used to support SELinux?
> 
> Thanks.
> 
> David
> 
>  src/security/security_selinux.c            | 6 ++++--
>  tests/securityselinuxlabeldata/chardev.txt | 2 +-
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index e2f34a27dc..8b258c9e36 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -2541,7 +2541,9 @@ virSecuritySELinuxSetChardevLabel(virSecurityManager *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))) {

I've copied the comment from corresponding _dac.c function, so that it's
obvious why we are relabelling in this case too.

>              if (virSecuritySELinuxSetFilecon(mgr,
>                                               dev_source->data.nix.path,
>                                               imagelabel,
> @@ -2618,7 +2620,7 @@ virSecuritySELinuxRestoreChardevLabel(virSecurityManager *mgr,
>      case VIR_DOMAIN_CHR_TYPE_UNIX:
>          if (!dev_source->data.nix.listen) {
>              if (virSecuritySELinuxRestoreFileLabel(mgr,
> -                                                   dev_source->data.file.path,
> +                                                   dev_source->data.nix.path,
>                                                     true) < 0)
>                  goto done;
>          }
> diff --git a/tests/securityselinuxlabeldata/chardev.txt b/tests/securityselinuxlabeldata/chardev.txt
> index 3f4b6302b9..bdb367f7a5 100644
> --- a/tests/securityselinuxlabeldata/chardev.txt
> +++ b/tests/securityselinuxlabeldata/chardev.txt
> @@ -2,6 +2,6 @@
>  /plain.dev;system_u:object_r:svirt_image_t:s0:c41,c264
>  /plain.fifo;system_u:object_r:svirt_image_t:s0:c41,c264
>  /nolabel.sock;
> -/plain.sock;
> +/plain.sock;system_u:object_r:svirt_image_t:s0:c41,c264
>  /yeslabel.sock;system_u:object_r:svirt_image_t:s0:c41,c264
>  /altlabel.sock;system_u:object_r:svirt_image_custom_t:s0:c41,c264

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

and pushed. Congratulations on your first libvirt contribution!

Michal


From mprivozn at redhat.com  Fri Jul  1 13:01:19 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 1 Jul 2022 15:01:19 +0200
Subject: [libvirt PATCH v2] tools: add virt-qmp-proxy for proxying QMP
 clients to libvirt QEMU guests
In-Reply-To: <20220620171950.1416742-1-berrange@redhat.com>
References: <20220620171950.1416742-1-berrange@redhat.com>
Message-ID: <9cd7eb31-cb62-c06d-edcf-04ed81d7c33b@redhat.com>

On 6/20/22 19:19, Daniel P. Berrang? wrote:
> Libvirt provides QMP passthrough APIs for the QEMU driver and these are
> exposed in virsh. It is not especially pleasant, however, using the raw
> QMP JSON syntax. QEMU has a tool 'qmp-shell' which can speak QMP and
> exposes a human friendly interactive shell. It is not possible to use
> this with libvirt managed guest, however, since only one client can
> attach to he QMP socket at any point in time.
> 
> The virt-qmp-proxy tool aims to solve this problem. It opens a UNIX
> socket and listens for incoming client connections, speaking QMP on
> the connected socket. It will forward any QMP commands received onto
> the running libvirt QEMU guest, and forward any replies back to the
> QMP client.
> 
>   $ virsh start demo
>   $ virt-qmp-proxy demo demo.qmp &
>   $ qmp-shell demo.qmp
>   Welcome to the QMP low-level shell!
>   Connected to QEMU 6.2.0
> 
>   (QEMU) query-kvm
>   {
>       "return": {
>           "enabled": true,
>           "present": true
>       }
>   }
> 
> Note this tool of course has the same risks as the raw libvirt
> QMP passthrough. It is safe to run query commands to fetch information
> but commands which change the QEMU state risk disrupting libvirt's
> management of QEMU, potentially resulting in data loss/corruption in
> the worst case.
> 
> Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
> ---
> 
> Changed in v2:
> 
>  - Rewrote to not be such a gross hack, specifically
>       - Wired up usage of libvirt event loop for sock I/O
>       - Register with libvirt for QMP events
>       - Incrementally read from socket & try json parsing
>         until we get a full command, instead of assuming
>         a full command in one read
>       - Forwarding of passed FDs in both directions
>         (libvirt -> client untested, since AFAIK, no
>         QMP cmd returns FDs currently)
> 
> 
> Other thought....
> 
> This patch is against libvirt.git but has a dependancy on the
> libvirt-python.git APIs. If we put this in libvirt-client RPM
> then we get a new dep on python.
> 
> Perhaps better to have this live in libvirt-python.git/examples,
> though I would like it present as a standard tool ? Another
> option is to bundle with virt-install which is a python app
> commonly present on virt hosts ?

Or, we could have it in a separate RPM which would require
libvirt-client and libvirt-python.

> 
>  docs/manpages/meson.build        |   1 +
>  docs/manpages/virt-qmp-proxy.rst | 120 +++++++++++
>  tools/meson.build                |   5 +
>  tools/virt-qmp-proxy             | 360 +++++++++++++++++++++++++++++++
>  4 files changed, 486 insertions(+)
>  create mode 100644 docs/manpages/virt-qmp-proxy.rst
>  create mode 100755 tools/virt-qmp-proxy

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From pkrempa at redhat.com  Fri Jul  1 13:46:36 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri,  1 Jul 2022 15:46:36 +0200
Subject: [PATCHv2] storage: pool: Allow more intricate nfs protocol versions
Message-ID: <c68f184562fa6f33ea22e1d222b9d520a2931d49.1656683165.git.pkrempa@redhat.com>

Treat the 'protocolVer' field as a string so that e.g. '4.1' can be
used. Forbid only ',' in the string as it's a separator of arguments for
mount options.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---

v2:
    - forbid ',' in the version string.

 docs/formatstorage.rst                          |  2 +-
 src/conf/schemas/storagepool.rng                |  4 +---
 src/conf/storage_conf.c                         | 17 ++++++++---------
 src/conf/storage_conf.h                         |  2 +-
 src/storage/storage_util.c                      |  4 ++--
 .../pool-netfs-protocol-ver-linux.argv          |  2 +-
 .../pool-netfs-protocol-ver.xml                 |  2 +-
 .../pool-netfs-protocol-ver.xml                 |  2 +-
 8 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/docs/formatstorage.rst b/docs/formatstorage.rst
index ef15c0ac5c..83d7d141ac 100644
--- a/docs/formatstorage.rst
+++ b/docs/formatstorage.rst
@@ -350,7 +350,7 @@ following child elements:
 ``protocol``
    For a ``netfs`` Storage Pool provide a mechanism to define which NFS protocol
    version number will be used to contact the server's NFS service. The
-   attribute ``ver`` accepts an unsigned integer as the version number to use.
+   attribute ``ver`` accepts the version number to use.
    :since:`Since 5.1.0`
 ``vendor``
    Provides optional information about the vendor of the storage device. This
diff --git a/src/conf/schemas/storagepool.rng b/src/conf/schemas/storagepool.rng
index bd24b8b8d0..d81ead532a 100644
--- a/src/conf/schemas/storagepool.rng
+++ b/src/conf/schemas/storagepool.rng
@@ -577,9 +577,7 @@
             <ref name="sourcefmtnetfs"/>
             <optional>
               <element name="protocol">
-                <attribute name="ver">
-                  <ref name="unsignedInt"/>
-                </attribute>
+                <attribute name="ver"/>
               </element>
             </optional>
             <optional>
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index 5da0bf20dd..79f16aadf3 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -483,6 +483,7 @@ virStoragePoolSourceClear(virStoragePoolSource *source)
     virStorageAuthDefFree(source->auth);
     VIR_FREE(source->vendor);
     VIR_FREE(source->product);
+    VIR_FREE(source->protocolVer);
 }


@@ -526,7 +527,6 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
     virStoragePoolOptions *options;
     int n;
     g_autoptr(virStorageAuthDef) authdef = NULL;
-    g_autofree char *ver = NULL;
     g_autofree xmlNodePtr *nodeset = NULL;
     g_autofree char *sourcedir = NULL;
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
@@ -634,7 +634,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
     }

     /* Option protocol version string (NFSvN) */
-    if ((ver = virXPathString("string(./protocol/@ver)", ctxt))) {
+    if ((source->protocolVer = virXPathString("string(./protocol/@ver)", ctxt))) {
         if ((source->format != VIR_STORAGE_POOL_NETFS_NFS) &&
             (source->format != VIR_STORAGE_POOL_NETFS_AUTO)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
@@ -643,10 +643,11 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt,
                            virStoragePoolFormatFileSystemNetTypeToString(source->format));
             return -1;
         }
-        if (virStrToLong_uip(ver, NULL, 0, &source->protocolVer) < 0) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("storage pool protocol ver '%s' is malformed"),
-                           ver);
+
+        if (strchr(source->protocolVer, ',')) {
+            virReportError(VIR_ERR_XML_DETAIL,
+                           _("storage pool protocol ver '%s' must not contain ','"),
+                           source->protocolVer);
             return -1;
         }
     }
@@ -1099,9 +1100,7 @@ virStoragePoolSourceFormat(virBuffer *buf,
     if (src->auth)
         virStorageAuthDefFormat(buf, src->auth);

-    if (src->protocolVer)
-        virBufferAsprintf(buf, "<protocol ver='%u'/>\n", src->protocolVer);
-
+    virBufferEscapeString(buf, "<protocol ver='%s'/>\n", src->protocolVer);
     virBufferEscapeString(buf, "<vendor name='%s'/>\n", src->vendor);
     virBufferEscapeString(buf, "<product name='%s'/>\n", src->product);

diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index de39c3f294..a1bf243935 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -213,7 +213,7 @@ struct _virStoragePoolSource {
     int format;

     /* Protocol version value for netfs */
-    unsigned int protocolVer;
+    char *protocolVer;
 };

 typedef struct _virStoragePoolTarget virStoragePoolTarget;
diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 6ed2078b65..3871718b09 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -4201,8 +4201,8 @@ virStorageBackendFileSystemMountCmd(const char *cmdstr,
     virCommand *cmd = NULL;
     g_autofree char *nfsVers = NULL;

-    if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer > 0)
-        nfsVers = g_strdup_printf("nfsvers=%u", def->source.protocolVer);
+    if (def->type == VIR_STORAGE_POOL_NETFS && def->source.protocolVer)
+        nfsVers = g_strdup_printf("nfsvers=%s", def->source.protocolVer);

     cmd = virCommandNew(cmdstr);
     if (netauto)
diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv
index dac46a074f..da3e0c5927 100644
--- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-linux.argv
@@ -1,5 +1,5 @@
 mount \
--o nodev,nosuid,noexec,nfsvers=3 \
+-o nodev,nosuid,noexec,nfsvers=4.1 \
 -t nfs \
 localhost:/var/lib/libvirt/images \
 /mnt
diff --git a/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml b/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml
index 40f3f94e41..f35992e3c8 100644
--- a/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml
+++ b/tests/storagepoolxml2xmlin/pool-netfs-protocol-ver.xml
@@ -8,7 +8,7 @@
     <host name='localhost'/>
     <dir path='/var/lib/libvirt/images'/>
     <format type='nfs'/>
-    <protocol ver='3'/>
+    <protocol ver='4.1'/>
   </source>
   <target>
     <path>/mnt</path>
diff --git a/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml b/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml
index 5fcad1305b..74c2f5edfe 100644
--- a/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml
+++ b/tests/storagepoolxml2xmlout/pool-netfs-protocol-ver.xml
@@ -8,7 +8,7 @@
     <host name='localhost'/>
     <dir path='/var/lib/libvirt/images'/>
     <format type='nfs'/>
-    <protocol ver='3'/>
+    <protocol ver='4.1'/>
   </source>
   <target>
     <path>/mnt</path>
-- 
2.36.1


From jtomko at redhat.com  Fri Jul  1 13:50:35 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Fri, 1 Jul 2022 15:50:35 +0200
Subject: [PATCHv2] storage: pool: Allow more intricate nfs protocol
 versions
In-Reply-To: <c68f184562fa6f33ea22e1d222b9d520a2931d49.1656683165.git.pkrempa@redhat.com>
References: <c68f184562fa6f33ea22e1d222b9d520a2931d49.1656683165.git.pkrempa@redhat.com>
Message-ID: <Yr77q4bWlalWgA/w@mjch>

On a Friday in 2022, Peter Krempa wrote:
>Treat the 'protocolVer' field as a string so that e.g. '4.1' can be
>used. Forbid only ',' in the string as it's a separator of arguments for
>mount options.
>
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
>
>v2:
>    - forbid ',' in the version string.
>
> docs/formatstorage.rst                          |  2 +-
> src/conf/schemas/storagepool.rng                |  4 +---
> src/conf/storage_conf.c                         | 17 ++++++++---------
> src/conf/storage_conf.h                         |  2 +-
> src/storage/storage_util.c                      |  4 ++--
> .../pool-netfs-protocol-ver-linux.argv          |  2 +-
> .../pool-netfs-protocol-ver.xml                 |  2 +-
> .../pool-netfs-protocol-ver.xml                 |  2 +-
> 8 files changed, 16 insertions(+), 19 deletions(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220701/0f202df7/attachment.sig>

From pkrempa at redhat.com  Fri Jul  1 14:56:13 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri,  1 Jul 2022 16:56:13 +0200
Subject: [PATCH] storagepoolxml2argvtest: Fix output data for
 'pool-netfs-protocol-ver'
Message-ID: <ebe0e34b640453abe4add79be74159bb8a94ef03.1656687338.git.pkrempa@redhat.com>

The storage pool tests have host-specific versions which I neglected to
update in commit c44930d932203b4a58dccbbeaa814fff6cea8216 thus breaking
the test-suite on non-linux OSes.

Fixes: c44930d932203b4a58dccbbeaa814fff6cea8216
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---

Pushed as a build-fix.

 .../pool-netfs-protocol-ver-freebsd.argv                        | 2 +-
 tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv
index 32cdaebcff..20954ef50c 100644
--- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver-freebsd.argv
@@ -1,5 +1,5 @@
 mount \
--o nosuid,noexec,nfsvers=3 \
+-o nosuid,noexec,nfsvers=4.1 \
 -t nfs \
 localhost:/var/lib/libvirt/images \
 /mnt
diff --git a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv
index ed157883c0..9afc6090b8 100644
--- a/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv
+++ b/tests/storagepoolxml2argvdata/pool-netfs-protocol-ver.argv
@@ -1,5 +1,5 @@
 mount \
--o nfsvers=3 \
+-o nfsvers=4.1 \
 -t nfs \
 localhost:/var/lib/libvirt/images \
 /mnt
-- 
2.36.1


From jtomko at redhat.com  Fri Jul  1 15:12:03 2022
From: jtomko at redhat.com (=?UTF-8?q?J=C3=A1n=20Tomko?=)
Date: Fri,  1 Jul 2022 17:12:03 +0200
Subject: [libvirt PATCH] conf: fix error message for wrong thread_pool_size
Message-ID: <17f8e36e224e200833b68c99308787f3c5d71d23.1656688316.git.jtomko@redhat.com>

Fix the copy-and-paste error by referring to the correct variable.

Fixes: 0df2e7df80452f81edbfeb0ee355235b533346a9
https://bugzilla.redhat.com/show_bug.cgi?id=2103132

Signed-off-by: J?n Tomko <jtomko at redhat.com>
---
Pushed as trivial.

 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 fb8bf4cfec..2c2f23242e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -9949,7 +9949,7 @@ virDomainFSDefParseXML(virDomainXMLOption *xmlopt,
             virStrToLong_i(thread_pool_size, NULL, 10, &def->thread_pool_size) < 0) {
             virReportError(VIR_ERR_XML_ERROR,
                            _("cannot parse thread pool size '%s' for virtiofs"),
-                           queue_size);
+                           thread_pool_size);
             goto error;
         }
 
-- 
2.35.3


From lin.a.yang at intel.com  Fri Jul  1 19:14:41 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:41 -0700
Subject: [libvirt][PATCH v13 1/6] Define SGX capabilities structs
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <20220701191446.727066-2-lin.a.yang@intel.com>

From: Haibin Huang <haibin.huang at intel.com>

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Signed-off-by: Haibin Huang <haibin.huang at intel.com>
---
 src/conf/domain_capabilities.c | 10 ++++++++++
 src/conf/domain_capabilities.h | 24 ++++++++++++++++++++++++
 src/libvirt_private.syms       |  1 +
 3 files changed, 35 insertions(+)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 895e8d00e8..27f3fb8d36 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -76,6 +76,16 @@ virSEVCapabilitiesFree(virSEVCapability *cap)
 }
 
 
+void
+virSGXCapabilitiesFree(virSGXCapability *cap)
+{
+    if (!cap)
+        return;
+
+    g_free(cap);
+}
+
+
 static void
 virDomainCapsDispose(void *obj)
 {
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index f2eed80b15..dac1098e98 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -192,6 +192,24 @@ struct _virSEVCapability {
     unsigned int max_es_guests;
 };
 
+typedef struct _virSection virSection;
+typedef virSection *virSectionPtr;
+struct _virSection {
+    unsigned long long size;
+    unsigned int node;
+};
+
+typedef struct _virSGXCapability virSGXCapability;
+typedef virSGXCapability *virSGXCapabilityPtr;
+struct _virSGXCapability {
+    bool flc;
+    bool sgx1;
+    bool sgx2;
+    unsigned long long section_size;
+    size_t nSections;
+    virSectionPtr pSections;
+};
+
 typedef enum {
     VIR_DOMAIN_CAPS_FEATURE_IOTHREADS = 0,
     VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO,
@@ -228,6 +246,7 @@ struct _virDomainCaps {
 
     virDomainCapsFeatureGIC gic;
     virSEVCapability *sev;
+    virSGXCapability *sgx;
     /* add new domain features here */
 
     virTristateBool features[VIR_DOMAIN_CAPS_FEATURE_LAST];
@@ -276,3 +295,8 @@ void
 virSEVCapabilitiesFree(virSEVCapability *capabilities);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSEVCapability, virSEVCapabilitiesFree);
+
+void
+virSGXCapabilitiesFree(virSGXCapability *capabilities);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSGXCapability, virSGXCapabilitiesFree);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 76bcc64eb0..5d17890746 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -216,6 +216,7 @@ virDomainCapsEnumSet;
 virDomainCapsFormat;
 virDomainCapsNew;
 virSEVCapabilitiesFree;
+virSGXCapabilitiesFree;
 
 
 # conf/domain_conf.h
-- 
2.25.1


From lin.a.yang at intel.com  Fri Jul  1 19:14:40 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:40 -0700
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
Message-ID: <20220701191446.727066-1-lin.a.yang@intel.com>

This patch series provides support for enabling Intel's Software Guard
Extensions (SGX) feature in guest VM.

Giving the SGX support in QEMU had been merged. Intel SGX is a set of
instructions that increases the security of application code and data,
giving them more protection from disclosure or modification.
Developers can partition sensitive information into enclaves, which
are areas of execution in memory with more security protection.

The typical flow looks below at very high level:

1. Calls virConnectGetDomainCapabilities API to domain capabilities
that includes the following SGX information.

<feature>
  ...
  <sgx supported='yes'>
    <flc>no</flc>                                                          
    <sgx1>yes</sgx1>                                                       
    <sgx2>no</sgx2>                                                        
    <section_size>2</section_size>                                         
    <sections>                                                             
      <section node='0' size='1'/>                                         
      <section node='1' size='1'/>                                         
    </sections>  
  </sgx>
  ...
</feature>

2. User requests to start a guest calling virCreateXML() with SGX
requirement. It supports both non-NUMA SGX interface in QEMU 6.2.0
and NUMA SGX interface in QEMU 7.0.0 and later version.

Without NUMA info:
<devices>
  ...
  <memory model='sgx-epc'>
    <target>
      <size unit='KiB'>N</size>
    </target>
  </memory>
  ...
</devices>

With NUMA info:
<devices>
  ...
  <memory model='sgx-epc'>
    <source>
      <nodemask>0-1</nodemask>
    </source>
    <target>
      <size unit='KiB'>16384</size>
      <node>0</node>
    </target>
  </memory>
  ...
</devices>

Please note that it assumes EPC target node in guest VM (.node
attribute) is not required in SGX related parameter in QEMU command
if QEMU didn't provide any SGX NUMA info, like QEMU 6.2.0 version.

Haibin Huang (4):
  Define SGX capabilities structs
  Get SGX capabilities form QMP
  Convert QMP capabilities to domain capabilities
  conf: expose SGX feature in domain capabilities

Lin Yang (2):
  conf: Introduce SGX EPC element into device memory xml
  qemu: Add command-line to generate SGX EPC memory backend

 docs/formatdomain.rst                         |  27 +-
 docs/formatdomaincaps.rst                     |  40 +++
 src/conf/domain_capabilities.c                |  58 ++++
 src/conf/domain_capabilities.h                |  24 ++
 src/conf/domain_conf.c                        |  27 ++
 src/conf/domain_conf.h                        |   1 +
 src/conf/domain_validate.c                    |   9 +
 src/conf/schemas/domaincaps.rng               |  42 +++
 src/conf/schemas/domaincommon.rng             |   1 +
 src/libvirt_private.syms                      |   1 +
 src/qemu/qemu_alias.c                         |   6 +-
 src/qemu/qemu_capabilities.c                  | 258 ++++++++++++++++++
 src/qemu/qemu_capabilities.h                  |   4 +
 src/qemu/qemu_command.c                       |  87 +++++-
 src/qemu/qemu_domain.c                        |  48 +++-
 src/qemu/qemu_domain_address.c                |   6 +
 src/qemu/qemu_driver.c                        |   1 +
 src/qemu/qemu_monitor.c                       |  10 +
 src/qemu/qemu_monitor.h                       |   3 +
 src/qemu/qemu_monitor_json.c                  | 154 ++++++++++-
 src/qemu/qemu_monitor_json.h                  |   4 +
 src/qemu/qemu_process.c                       |   2 +
 src/qemu/qemu_validate.c                      |   8 +
 src/security/security_apparmor.c              |   1 +
 src/security/security_dac.c                   |   2 +
 src/security/security_selinux.c               |   2 +
 tests/domaincapsdata/bhyve_basic.x86_64.xml   |   1 +
 tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |   1 +
 tests/domaincapsdata/bhyve_uefi.x86_64.xml    |   1 +
 tests/domaincapsdata/empty.xml                |   1 +
 tests/domaincapsdata/libxl-xenfv.xml          |   1 +
 tests/domaincapsdata/libxl-xenpv.xml          |   1 +
 .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml |   1 +
 .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml |   1 +
 tests/domaincapsdata/qemu_2.11.0.s390x.xml    |   1 +
 tests/domaincapsdata/qemu_2.11.0.x86_64.xml   |   1 +
 .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml |   1 +
 .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml |   1 +
 .../qemu_2.12.0-virt.aarch64.xml              |   1 +
 tests/domaincapsdata/qemu_2.12.0.aarch64.xml  |   1 +
 tests/domaincapsdata/qemu_2.12.0.ppc64.xml    |   1 +
 tests/domaincapsdata/qemu_2.12.0.s390x.xml    |   1 +
 tests/domaincapsdata/qemu_2.12.0.x86_64.xml   |   1 +
 .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_3.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_3.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_3.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_4.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |   1 +
 .../qemu_4.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_4.2.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_5.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_5.1.0.sparc.xml     |   1 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |   1 +
 .../qemu_5.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_5.2.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_6.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_6.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |   6 +
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |   6 +
 .../qemu_6.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |   6 +
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |  10 +
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |  10 +
 .../qemu_7.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |  10 +
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |  10 +
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |  10 +
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |  10 +
 .../caps_6.2.0.x86_64.replies                 |  30 +-
 .../caps_6.2.0.x86_64.xml                     |   7 +
 .../caps_7.0.0.x86_64.replies                 |  34 ++-
 .../caps_7.0.0.x86_64.xml                     |  11 +
 .../caps_7.1.0.x86_64.replies                 |  34 ++-
 .../caps_7.1.0.x86_64.xml                     |  11 +
 .../sgx-epc-numa.x86_64-latest.args           |  40 +++
 tests/qemuxml2argvdata/sgx-epc-numa.xml       |  50 ++++
 .../sgx-epc.x86_64-6.2.0.args                 |  37 +++
 tests/qemuxml2argvdata/sgx-epc.xml            |  36 +++
 tests/qemuxml2argvtest.c                      |   3 +
 .../sgx-epc-numa.x86_64-latest.xml            |  64 +++++
 .../sgx-epc.x86_64-6.2.0.xml                  |  52 ++++
 tests/qemuxml2xmltest.c                       |   3 +
 124 files changed, 1349 insertions(+), 42 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml
 create mode 100644 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml

-- 
2.25.1


From lin.a.yang at intel.com  Fri Jul  1 19:14:43 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:43 -0700
Subject: [libvirt][PATCH v13 3/6] Convert QMP capabilities to domain
 capabilities
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <20220701191446.727066-4-lin.a.yang@intel.com>

From: Haibin Huang <haibin.huang at intel.com>

the QMP capabilities:
  {"return":
    {
      "sgx": true,
      "section-size": 1024,
      "flc": true
    }
  }

the domain capabilities:
  <sgx>
    <flc>yes</flc>
    <epc_size>1</epc_size>
  </sgx>

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Signed-off-by: Haibin Huang <haibin.huang at intel.com>
---
 src/qemu/qemu_capabilities.c                  | 230 ++++++++++++++++++
 src/qemu/qemu_capabilities.h                  |   4 +
 .../caps_6.2.0.x86_64.replies                 |  30 ++-
 .../caps_6.2.0.x86_64.xml                     |   7 +
 .../caps_7.0.0.x86_64.replies                 |  34 ++-
 .../caps_7.0.0.x86_64.xml                     |  11 +
 .../caps_7.1.0.x86_64.replies                 |  34 ++-
 .../caps_7.1.0.x86_64.xml                     |  11 +
 8 files changed, 346 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2c3be3ecec..57b5acb150 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
+              "sgx-epc", /* QEMU_CAPS_SGX_EPC */
     );
 
 
@@ -752,6 +753,8 @@ struct _virQEMUCaps {
 
     virSEVCapability *sevCapabilities;
 
+    virSGXCapability *sgxCapabilities;
+
     /* Capabilities which may differ depending on the accelerator. */
     virQEMUCapsAccel kvm;
     virQEMUCapsAccel hvf;
@@ -1394,6 +1397,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "s390-pv-guest", QEMU_CAPS_S390_PV_GUEST },
     { "virtio-mem-pci", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI },
     { "virtio-iommu-pci", QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI },
+    { "sgx-epc", QEMU_CAPS_SGX_EPC },
 };
 
 
@@ -1972,6 +1976,32 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst,
 }
 
 
+static int
+virQEMUCapsSGXInfoCopy(virSGXCapability **dst,
+                       virSGXCapability *src)
+{
+    g_autoptr(virSGXCapability) tmp = NULL;
+
+    tmp = g_new0(virSGXCapability, 1);
+
+    tmp->flc = src->flc;
+    tmp->sgx1 = src->sgx1;
+    tmp->sgx2 = src->sgx2;
+    tmp->section_size = src->section_size;
+
+    if (src->nSections == 0) {
+        tmp->nSections = 0;
+        tmp->pSections = NULL;
+    } else {
+        tmp->nSections = src->nSections;
+        tmp->pSections = src->pSections;
+    }
+
+    *dst = g_steal_pointer(&tmp);
+    return 0;
+}
+
+
 static void
 virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
                                  virQEMUCapsAccel *src)
@@ -2053,6 +2083,12 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
                                qemuCaps->sevCapabilities) < 0)
         return NULL;
 
+
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) &&
+        virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities,
+                               qemuCaps->sgxCapabilities) < 0)
+        return NULL;
+
     return g_steal_pointer(&ret);
 }
 
@@ -2091,6 +2127,7 @@ void virQEMUCapsDispose(void *obj)
     virCPUDataFree(qemuCaps->cpuData);
 
     virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
+    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
 
     virQEMUCapsAccelClear(&qemuCaps->kvm);
     virQEMUCapsAccelClear(&qemuCaps->hvf);
@@ -2616,6 +2653,13 @@ virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps)
 }
 
 
+virSGXCapabilityPtr
+virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps)
+{
+    return qemuCaps->sgxCapabilities;
+}
+
+
 static int
 virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
                             qemuMonitor *mon)
@@ -3442,6 +3486,31 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCaps *qemuCaps,
 }
 
 
+static int
+virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qemuCaps,
+                                   qemuMonitor *mon)
+{
+    int rc = -1;
+    virSGXCapability *caps = NULL;
+
+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
+        return 0;
+
+    if ((rc = qemuMonitorGetSGXCapabilities(mon, &caps)) < 0)
+        return -1;
+
+    /* SGX isn't actually supported */
+    if (rc == 0) {
+        virQEMUCapsClear(qemuCaps, QEMU_CAPS_SGX_EPC);
+        return 0;
+    }
+
+    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
+    qemuCaps->sgxCapabilities = caps;
+    return 0;
+}
+
+
 /*
  * Filter for features which should never be passed to QEMU. Either because
  * QEMU never supported them or they were dropped as they never did anything
@@ -4220,6 +4289,116 @@ virQEMUCapsParseSEVInfo(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
 }
 
 
+static int
+virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
+                        xmlXPathContextPtr ctxt)
+{
+    g_autoptr(virSGXCapability) sgx = NULL;
+    xmlNodePtr node;
+
+    g_autofree xmlNodePtr *nodes = NULL;
+    g_autofree xmlNodePtr *sectionNodes = NULL;
+    g_autofree char *flc = NULL;
+    g_autofree char *sgx1 = NULL;
+    g_autofree char *sgx2 = NULL;
+
+    int n = 0;
+    int nsections = 0;
+
+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
+        return 0;
+
+    if (virXPathBoolean("boolean(./sgx)", ctxt) == 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing SGX platform data in QEMU capabilities cache"));
+        return -1;
+    }
+
+    sgx = g_new0(virSGXCapability, 1);
+
+    if ((!(flc = virXPathString("string(./sgx/flc)", ctxt))) ||
+        virStringParseYesNo(flc, &sgx->flc) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or invalid SGX platform flc in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if ((!(sgx1 = virXPathString("string(./sgx/sgx1)", ctxt))) ||
+        virStringParseYesNo(sgx1, &sgx->sgx1) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or invalid SGX platform sgx1 in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if ((!(sgx2 = virXPathString("string(./sgx/sgx2)", ctxt))) ||
+        virStringParseYesNo(sgx2, &sgx->sgx2) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or invalid SGX platform sgx2 in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if (virXPathULongLong("string(./sgx/section_size)", ctxt, &sgx->section_size) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or malformed SGX platform section_size in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if ((n = virXPathNodeSet("./sgx/sections", ctxt, &nodes)) < 0) {
+        sgx->nSections = 0;
+        sgx->pSections = NULL;
+        VIR_INFO("Sections was not obtained, so QEMU version is 6.2.0");
+        qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
+        return 0;
+    }
+
+    if (n == 0) {
+        qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
+        return 0;
+    }
+
+    // Got the section, the QEMU version is above 7.0.0
+    node = ctxt->node;
+    ctxt->node = nodes[0];
+    nsections = virXPathNodeSet("./section", ctxt, &sectionNodes);
+    ctxt->node = node;
+
+    if (nsections < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("failed to parse CPU blockers in QEMU capabilities"));
+        return -1;
+    }
+
+    if (nsections > 0) {
+        size_t i;
+        g_autofree char * strNode = NULL;
+        g_autofree char * strSize = NULL;
+        sgx->nSections = nsections;
+        sgx->pSections = g_new0(virSection, nsections + 1);
+
+        for (i = 0; i < nsections; i++) {
+            if ((strNode = virXMLPropString(sectionNodes[i], "node")) &&
+                (virStrToLong_ui(strNode, NULL, 10, &(sgx->pSections[i].node)) < 0)) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                _("missing node name in QEMU "
+                                    "capabilities cache"));
+                return -1;
+            }
+
+            if ((strSize = virXMLPropString(sectionNodes[i], "size")) &&
+                (virStrToLong_ull(strSize, NULL, 10, &(sgx->pSections[i].size)) < 0)) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                                _("missing size name in QEMU "
+                                    "capabilities cache"));
+                return -1;
+            }
+        }
+    }
+
+    qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
+    return 0;
+}
+
+
 static int
 virQEMUCapsParseFlags(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
 {
@@ -4522,6 +4701,9 @@ virQEMUCapsLoadCache(virArch hostArch,
     if (virQEMUCapsParseSEVInfo(qemuCaps, ctxt) < 0)
         return -1;
 
+    if (virQEMUCapsParseSGXInfo(qemuCaps, ctxt) < 0)
+        return -1;
+
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
         virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_HVF))
@@ -4707,6 +4889,49 @@ virQEMUCapsFormatSEVInfo(virQEMUCaps *qemuCaps, virBuffer *buf)
 }
 
 
+static void
+virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
+                         virBuffer *buf)
+{
+    virSGXCapabilityPtr sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
+    size_t i;
+
+    virBufferAddLit(buf, "<sgx supported='yes'>\n");
+    virBufferAdjustIndent(buf, 2);
+    if (sgx->flc) {
+        virBufferAsprintf(buf, "<flc>%s</flc>\n", "yes");
+    } else {
+        virBufferAsprintf(buf, "<flc>%s</flc>\n", "no");
+    }
+    if (sgx->sgx1) {
+        virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "yes");
+    } else {
+        virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "no");
+    }
+    if (sgx->sgx2) {
+        virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "yes");
+    } else {
+        virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "no");
+    }
+    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
+
+    if (sgx->nSections > 0) {
+        virBufferAddLit(buf, "<sections>\n");
+
+        for (i = 0; i < sgx->nSections; i++) {
+            virBufferAdjustIndent(buf, 2);
+            virBufferAsprintf(buf, "<section node='%u' ", sgx->pSections[i].node);
+            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->pSections[i].size);
+            virBufferAdjustIndent(buf, -2);
+        }
+        virBufferAddLit(buf, "</sections>\n");
+    }
+
+    virBufferAdjustIndent(buf, -2);
+    virBufferAddLit(buf, "</sgx>\n");
+}
+
+
 char *
 virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
 {
@@ -4788,6 +5013,9 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
     if (qemuCaps->sevCapabilities)
         virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
 
+    if (qemuCaps->sgxCapabilities)
+        virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
+
     if (qemuCaps->kvmSupportsNesting)
         virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
 
@@ -5455,6 +5683,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
         return -1;
     if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
         return -1;
+    if (virQEMUCapsProbeQMPSGXCapabilities(qemuCaps, mon) < 0)
+        return -1;
 
     virQEMUCapsInitProcessCaps(qemuCaps);
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6f35ba1485..fc8c0fde1b 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
+    QEMU_CAPS_SGX_EPC, /* -object sgx-epc,... */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
@@ -843,6 +844,9 @@ virQEMUCapsCPUFeatureFromQEMU(virQEMUCaps *qemuCaps,
 virSEVCapability *
 virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps);
 
+virSGXCapabilityPtr
+virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps);
+
 bool
 virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_GNUC_NO_INLINE;
 
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index e235532d62..0151ab07fa 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -7459,15 +7459,15 @@
           "type": "bool"
         },
         {
-          "name": "sgx1",
+          "name": "flc",
           "type": "bool"
         },
         {
-          "name": "sgx2",
+          "name": "sgx1",
           "type": "bool"
         },
         {
-          "name": "flc",
+          "name": "sgx2",
           "type": "bool"
         },
         {
@@ -32707,6 +32707,22 @@
   }
 }
 
+{
+  "execute": "query-sgx-capabilities",
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "sgx": true,
+    "flc": false,
+    "sgx1": true,
+    "sgx2": false,
+    "section-size": 2048
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -32715,7 +32731,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33048,7 +33064,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33062,7 +33078,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -33395,7 +33411,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 19605d93ae..e1f177281f 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -238,6 +238,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='sgx-epc'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
@@ -3706,4 +3707,10 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <sgx supported='yes'>
+    <flc>no</flc>
+    <sgx1>yes</sgx1>
+    <sgx2>no</sgx2>
+    <section_size unit='KiB'>2</section_size>
+  </sgx>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
index 620442704a..9f806412f7 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -33317,6 +33317,32 @@
   }
 }
 
+{
+  "execute": "query-sgx-capabilities",
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "sgx": true,
+    "flc": false,
+    "sgx1": true,
+    "sgx2": false,
+    "section-size": 2048,
+    "sections": [
+      {
+        "node": 0,
+        "size": 1024
+      },
+      {
+        "node": 1,
+        "size": 1024
+      }
+    ]
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -33325,7 +33351,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33662,7 +33688,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33676,7 +33702,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -34013,7 +34039,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 05f844fd5b..7cad1fd7d8 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -243,6 +243,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
+  <flag name='sgx-epc'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
@@ -3771,4 +3772,14 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <sgx supported='yes'>
+    <flc>no</flc>
+    <sgx1>yes</sgx1>
+    <sgx2>no</sgx2>
+    <section_size unit='KiB'>2</section_size>
+    <sections>
+      <section node='0' size='1'/>
+      <section node='1' size='1'/>
+    </sections>
+  </sgx>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
index 025d2db895..b9f9201ac7 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
@@ -33866,6 +33866,32 @@
   }
 }
 
+{
+  "execute": "query-sgx-capabilities",
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "sgx": true,
+    "flc": false,
+    "sgx1": true,
+    "sgx2": false,
+    "section-size": 2048,
+    "sections": [
+      {
+        "node": 0,
+        "size": 1024
+      },
+      {
+        "node": 1,
+        "size": 1024
+      }
+    ]
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -33874,7 +33900,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -34212,7 +34238,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -34226,7 +34252,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -34564,7 +34590,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 3707d9b7c9..21b5e361b1 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -244,6 +244,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
   <flag name='iothread.thread-pool-max'/>
+  <flag name='sgx-epc'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
@@ -3569,4 +3570,14 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <sgx supported='yes'>
+    <flc>no</flc>
+    <sgx1>yes</sgx1>
+    <sgx2>no</sgx2>
+    <section_size unit='KiB'>2</section_size>
+    <sections>
+      <section node='0' size='1'/>
+      <section node='1' size='1'/>
+    </sections>
+  </sgx>
 </qemuCaps>
-- 
2.25.1


From lin.a.yang at intel.com  Fri Jul  1 19:14:45 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:45 -0700
Subject: [libvirt][PATCH v13 5/6] conf: Introduce SGX EPC element into device
 memory xml
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <20220701191446.727066-6-lin.a.yang@intel.com>

With NUMA config:

<devices>
  ...
  <memory model='sgx-epc'>
    <source>
      <nodemask>0-1</nodemask>
    </source>
    <target>
      <size unit='KiB'>512</size>
      <node>0</node>
    </target>
  </memory>
  ...
</devices>

Without NUMA config:

<devices>
  ...
  <memory model='sgx-epc'>
    <target>
      <size unit='KiB'>512</size>
    </target>
  </memory>
  ...
</devices>

Signed-off-by: Lin Yang <lin.a.yang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomain.rst                         | 27 +++++++-
 src/conf/domain_conf.c                        | 27 ++++++++
 src/conf/domain_conf.h                        |  1 +
 src/conf/domain_validate.c                    |  9 +++
 src/conf/schemas/domaincommon.rng             |  1 +
 src/qemu/qemu_alias.c                         |  3 +
 src/qemu/qemu_command.c                       |  1 +
 src/qemu/qemu_domain.c                        | 48 ++++++++++----
 src/qemu/qemu_domain_address.c                |  6 ++
 src/qemu/qemu_driver.c                        |  1 +
 src/qemu/qemu_process.c                       |  2 +
 src/qemu/qemu_validate.c                      |  8 +++
 src/security/security_apparmor.c              |  1 +
 src/security/security_dac.c                   |  2 +
 src/security/security_selinux.c               |  2 +
 tests/qemuxml2argvdata/sgx-epc-numa.xml       | 50 +++++++++++++++
 tests/qemuxml2argvdata/sgx-epc.xml            | 36 +++++++++++
 .../sgx-epc-numa.x86_64-latest.xml            | 64 +++++++++++++++++++
 .../sgx-epc.x86_64-6.2.0.xml                  | 52 +++++++++++++++
 tests/qemuxml2xmltest.c                       |  3 +
 20 files changed, 329 insertions(+), 15 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml
 create mode 100644 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 62a94890f0..b95c930d73 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -7910,6 +7910,20 @@ Example: usage of the memory devices
          <current unit='KiB'>524288</current>
        </target>
      </memory>
+     <memory model='sgx-epc'>
+       <source>
+         <nodemask>0-1</nodemask>
+       </source>
+       <target>
+         <size unit='KiB'>16384</size>
+         <node>0</node>
+       </target>
+     </memory>
+     <memory model='sgx-epc'>
+       <target>
+         <size unit='KiB'>16384</size>
+       </target>
+     </memory>
    </devices>
    ...
 
@@ -7918,7 +7932,9 @@ Example: usage of the memory devices
    1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.
    :since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized
    persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model
-   to add paravirtualized memory device. :since:`Since 7.9.0`
+   to add paravirtualized memory device. :since:`Since 7.9.0` Provide
+   ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.
+   :since:`Since 8.6.0 and QEMU 6.2.0`
 
 ``access``
    An optional attribute ``access`` ( :since:`since 3.2.0` ) that provides
@@ -7978,6 +7994,13 @@ Example: usage of the memory devices
      Represents a path in the host that backs the virtio memory module in the
      guest. It is mandatory.
 
+   For model ``sgx-epc`` this element is optional. The following optional
+   elements may be used:
+
+   ``nodemask``
+      This element can be used to override the default set of NUMA nodes where
+      the memory would be allocated. :since:`Since 8.6.0 and QEMU 7.0.0`
+
 ``target``
    The mandatory ``target`` element configures the placement and sizing of the
    added memory from the perspective of the guest.
@@ -7988,6 +8011,8 @@ Example: usage of the memory devices
 
    The ``node`` subelement configures the guest NUMA node to attach the memory
    to. The element shall be used only if the guest has NUMA nodes configured.
+   For model ``sgx-epc`` this element is optional. It will be set to 0 as
+   default. :since:`Since 8.6.0 and QEMU 7.0.0`
 
    The following optional elements may be used:
 
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 709ca53790..f8b67eb375 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1431,6 +1431,7 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
               "nvdimm",
               "virtio-pmem",
               "virtio-mem",
+              "sgx-epc",
 );
 
 VIR_ENUM_IMPL(virDomainShmemModel,
@@ -5680,6 +5681,7 @@ virDomainMemoryDefPostParse(virDomainMemoryDef *mem,
 
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -14697,6 +14699,20 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
         def->nvdimmPath = virXPathString("string(./path)", ctxt);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if ((nodemask = virXPathString("string(./nodemask)", ctxt))) {
+            if (virBitmapParse(nodemask, &def->sourceNodes,
+                               VIR_DOMAIN_CPUMASK_LEN) < 0)
+                return -1;
+
+            if (virBitmapIsAllClear(def->sourceNodes)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("Invalid value of 'nodemask': %s"), nodemask);
+                return -1;
+            }
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -14765,6 +14781,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
     }
@@ -16561,6 +16578,7 @@ virDomainMemoryFindByDefInternal(virDomainDef *def,
                 continue;
             break;
 
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
@@ -26153,6 +26171,15 @@ virDomainMemorySourceDefFormat(virBuffer *buf,
         virBufferEscapeString(&childBuf, "<path>%s</path>\n", def->nvdimmPath);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (def->sourceNodes) {
+            if (!(bitmap = virBitmapFormat(def->sourceNodes)))
+                return -1;
+
+            virBufferAsprintf(&childBuf, "<nodemask>%s</nodemask>\n", bitmap);
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4c8c42b7eb..a15798463c 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2559,6 +2559,7 @@ typedef enum {
     VIR_DOMAIN_MEMORY_MODEL_NVDIMM, /* nvdimm memory device */
     VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM, /* virtio-pmem memory device */
     VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM, /* virtio-mem memory device */
+    VIR_DOMAIN_MEMORY_MODEL_SGX_EPC, /* SGX enclave page cache */
 
     VIR_DOMAIN_MEMORY_MODEL_LAST
 } virDomainMemoryModel;
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 28b0481d4e..c8f03cb844 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2231,6 +2231,15 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("memory device address is not supported for model '%s'"),
+                           virDomainMemoryModelTypeToString(mem->model));
+            return -1;
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     default:
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index da2fb0d5cb..c6377b2e90 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -6833,6 +6833,7 @@
           <value>nvdimm</value>
           <value>virtio-pmem</value>
           <value>virtio-mem</value>
+          <value>sgx-epc</value>
         </choice>
       </attribute>
       <optional>
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 7efd91051e..5ebeb82f92 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -515,6 +515,9 @@ qemuAssignDeviceMemoryAlias(virDomainDef *def,
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
         prefix = "virtiomem";
         break;
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        prefix = "epc";
+        break;
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     default:
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b307d3139c..7ca183ded7 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4010,6 +4010,7 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg,
             return NULL;
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     default:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 60ed358871..fc64a5ca9c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8448,6 +8448,7 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driver,
             break;
 
         case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
@@ -9129,6 +9130,12 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
         }
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("hotplug is not supported for the %s device"),
+                       virDomainMemoryModelTypeToString(mem->model));
+            return -1;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         return -1;
@@ -9164,7 +9171,7 @@ int
 qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
                                    const virDomainMemoryDef *mem)
 {
-    unsigned int nmems = def->nmems;
+    unsigned int hotplugNum = 0;
     unsigned long long hotplugSpace;
     unsigned long long hotplugMemory = 0;
     size_t i;
@@ -9172,15 +9179,37 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
     hotplugSpace = def->mem.max_memory - virDomainDefGetMemoryInitial(def);
 
     if (mem) {
-        nmems++;
+        hotplugNum++;
         hotplugMemory = mem->size;
 
         if (qemuDomainDefValidateMemoryHotplugDevice(mem, def) < 0)
             return -1;
     }
 
+    for (i = 0; i < def->nmems; i++) {
+        switch (def->mems[i]->model) {
+        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+            hotplugMemory += def->mems[i]->size;
+            hotplugNum++;
+            /* already existing devices don't need to be checked on hotplug */
+            if (!mem &&
+                qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)
+                return -1;
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            /* sgx epc memory does not support hotplug */
+        case VIR_DOMAIN_MEMORY_MODEL_LAST:
+        case VIR_DOMAIN_MEMORY_MODEL_NONE:
+            break;
+        }
+    }
+
     if (!virDomainDefHasMemoryHotplug(def)) {
-        if (nmems) {
+        if (hotplugNum) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("cannot use/hotplug a memory device when domain "
                              "'maxMemory' is not defined"));
@@ -9203,22 +9232,13 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
         }
     }
 
-    if (nmems > def->mem.memory_slots) {
+    if (hotplugNum > def->mem.memory_slots) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("memory device count '%u' exceeds slots count '%u'"),
-                       nmems, def->mem.memory_slots);
+                       hotplugNum, def->mem.memory_slots);
         return -1;
     }
 
-    for (i = 0; i < def->nmems; i++) {
-        hotplugMemory += def->mems[i]->size;
-
-        /* already existing devices don't need to be checked on hotplug */
-        if (!mem &&
-            qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)
-            return -1;
-    }
-
     if (hotplugMemory > hotplugSpace) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("memory device total size exceeds hotplug space"));
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 753733d1b9..a111ae4d0c 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -389,6 +389,7 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
         }
@@ -1039,6 +1040,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             return 0;
         }
@@ -2421,6 +2423,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
         }
@@ -3081,6 +3084,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
         return qemuDomainEnsurePCIAddress(vm, &dev);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -3107,6 +3111,7 @@ qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm,
         qemuDomainReleaseDeviceAddress(vm, &mem->info);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -3140,6 +3145,7 @@ qemuDomainAssignMemorySlots(virDomainDef *def)
         case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
             /* handled in qemuDomainAssignPCIAddresses() */
             break;
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3b5c3db67c..79a6c420c0 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7156,6 +7156,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDomainMemoryDef *oldDef,
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("cannot modify memory of model '%s'"),
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 771a623ef7..b907387f21 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3935,6 +3935,7 @@ qemuProcessDomainMemoryDefNeedHugepagesPath(const virDomainMemoryDef *mem,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         /* None of these can be backed by hugepages. */
         return false;
@@ -4009,6 +4010,7 @@ qemuProcessNeedMemoryBackingPath(virDomainDef *def,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
         case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             /* Backed by user provided path. Not stored in memory
              * backing dir anyway. */
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 39210ba65b..fbbfedd095 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -5173,6 +5173,14 @@ qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
         }
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("sgx epc isn't supported by this QEMU binary"));
+            return -1;
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 008384dee8..36e8ce42b5 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -687,6 +687,7 @@ AppArmorSetMemoryLabel(virSecurityManager *mgr,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
     }
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 21cebae694..d94995c9cf 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -1853,6 +1853,7 @@ virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
         ret = 0;
@@ -2040,6 +2041,7 @@ virSecurityDACSetMemoryLabel(virSecurityManager *mgr,
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
         ret = 0;
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index e2f34a27dc..6657663483 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1580,6 +1580,7 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
     }
@@ -1608,6 +1609,7 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr,
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         ret = 0;
diff --git a/tests/qemuxml2argvdata/sgx-epc-numa.xml b/tests/qemuxml2argvdata/sgx-epc-numa.xml
new file mode 100644
index 0000000000..f28b06dd79
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc-numa.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'>2</vcpu>
+  <cpu>
+    <numa>
+      <cell id="0" cpus="0" memory="109550" unit="KiB"/>
+      <cell id="1" cpus="1" memory="109550" unit="KiB"/>
+    </numa>
+  </cpu>
+  <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='usb' index='0' model='none'/>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memory model='sgx-epc'>
+      <source>
+        <nodemask>0-1</nodemask>
+      </source>
+      <target>
+        <size unit='MiB'>64</size>
+        <node>0</node>
+      </target>
+    </memory>
+    <memory model='sgx-epc'>
+      <source>
+        <nodemask>2-3</nodemask>
+      </source>
+      <target>
+        <size unit='MiB'>16</size>
+        <node>1</node>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/sgx-epc.xml b/tests/qemuxml2argvdata/sgx-epc.xml
new file mode 100644
index 0000000000..65ae8ae296
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc.xml
@@ -0,0 +1,36 @@
+<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='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='usb' index='0' model='none'/>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memory model='sgx-epc'>
+      <target>
+        <size unit='MiB'>64</size>
+      </target>
+    </memory>
+    <memory model='sgx-epc'>
+      <target>
+        <size unit='MiB'>16</size>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml b/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
new file mode 100644
index 0000000000..ceab82110c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
@@ -0,0 +1,64 @@
+<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'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='q35'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+    <numa>
+      <cell id='0' cpus='0' memory='109550' unit='KiB'/>
+      <cell id='1' cpus='1' memory='109550' 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='pci' index='0' model='pcie-root'/>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <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>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </memballoon>
+    <memory model='sgx-epc'>
+      <source>
+        <nodemask>0-1</nodemask>
+      </source>
+      <target>
+        <size unit='KiB'>65536</size>
+        <node>0</node>
+      </target>
+    </memory>
+    <memory model='sgx-epc'>
+      <source>
+        <nodemask>2-3</nodemask>
+      </source>
+      <target>
+        <size unit='KiB'>16384</size>
+        <node>1</node>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml
new file mode 100644
index 0000000000..06cc3e7a44
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml
@@ -0,0 +1,52 @@
+<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='x86_64' machine='pc-q35-6.2'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <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>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </memballoon>
+    <memory model='sgx-epc'>
+      <target>
+        <size unit='KiB'>65536</size>
+      </target>
+    </memory>
+    <memory model='sgx-epc'>
+      <target>
+        <size unit='KiB'>16384</size>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4ad6b4dac1..774da004b7 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1456,6 +1456,9 @@ mymain(void)
     DO_TEST_CAPS_LATEST("channel-qemu-vdagent");
     DO_TEST_CAPS_LATEST("channel-qemu-vdagent-features");
 
+    DO_TEST_CAPS_VER("sgx-epc", "6.2.0");
+    DO_TEST_CAPS_LATEST("sgx-epc-numa");
+
  cleanup:
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(fakerootdir);
-- 
2.25.1


From lin.a.yang at intel.com  Fri Jul  1 19:14:44 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:44 -0700
Subject: [libvirt][PATCH v13 4/6] conf: expose SGX feature in domain
 capabilities
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <20220701191446.727066-5-lin.a.yang@intel.com>

From: Haibin Huang <haibin.huang at intel.com>

Extend hypervisor capabilities to include sgx feature. When available,
the hypervisor supports launching an VM with SGX on Intel platfrom.
The SGX feature tag privides additional details like section size and
sgx1 or sgx2.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Signed-off-by: Haibin Huang <haibin.huang at intel.com>
---
 docs/formatdomaincaps.rst                     | 40 ++++++++++++++++
 src/conf/domain_capabilities.c                | 48 +++++++++++++++++++
 src/conf/schemas/domaincaps.rng               | 42 ++++++++++++++++
 src/qemu/qemu_capabilities.c                  | 28 +++++++++++
 tests/domaincapsdata/bhyve_basic.x86_64.xml   |  1 +
 tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |  1 +
 tests/domaincapsdata/bhyve_uefi.x86_64.xml    |  1 +
 tests/domaincapsdata/empty.xml                |  1 +
 tests/domaincapsdata/libxl-xenfv.xml          |  1 +
 tests/domaincapsdata/libxl-xenpv.xml          |  1 +
 .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml |  1 +
 .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml |  1 +
 tests/domaincapsdata/qemu_2.11.0.s390x.xml    |  1 +
 tests/domaincapsdata/qemu_2.11.0.x86_64.xml   |  1 +
 .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml |  1 +
 .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml |  1 +
 .../qemu_2.12.0-virt.aarch64.xml              |  1 +
 tests/domaincapsdata/qemu_2.12.0.aarch64.xml  |  1 +
 tests/domaincapsdata/qemu_2.12.0.ppc64.xml    |  1 +
 tests/domaincapsdata/qemu_2.12.0.s390x.xml    |  1 +
 tests/domaincapsdata/qemu_2.12.0.x86_64.xml   |  1 +
 .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_3.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_3.0.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_3.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |  1 +
 .../qemu_4.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  1 +
 .../qemu_4.2.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_4.2.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
 .../qemu_5.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_5.1.0.sparc.xml     |  1 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |  1 +
 .../qemu_5.2.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_5.2.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |  1 +
 .../qemu_6.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_6.0.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  6 +++
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  6 +++
 .../qemu_6.2.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  6 +++
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 10 ++++
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 10 ++++
 .../qemu_7.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 10 ++++
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 10 ++++
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 10 ++++
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 10 ++++
 88 files changed, 311 insertions(+)

diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
index 933469b2a2..d3bdee28d4 100644
--- a/docs/formatdomaincaps.rst
+++ b/docs/formatdomaincaps.rst
@@ -519,6 +519,16 @@ capabilities. All features occur as children of the main ``features`` element.
          <cbitpos>47</cbitpos>
          <reduced-phys-bits>1</reduced-phys-bits>
        </sev>
+       <sgx supported='yes'>
+         <flc>no</flc>
+         <sgx1>yes</sgx1>
+         <sgx2>no</sgx2>
+         <section_size>2</section_size>
+         <sections>
+           <section node='0' size='1'/>
+           <section node='1' size='1'/>
+         </sections>
+       </sgx>
      </features>
    </domainCapabilities>
 
@@ -598,3 +608,33 @@ in domain XML <formatdomain.html#launch-security>`__
 ``maxESGuests``
    The maximum number of SEV-ES guests that can be launched on the host. This
    value may be configurable in the firmware for some hosts.
+
+SGX capabilities
+^^^^^^^^^^^^^^^^
+
+Intel Software Guard Extensions (Intel SGX) capabilities are exposed under the
+``sgx`` element.
+
+Intel SGX helps protect data in use via unique application isolation technology.
+Protect selected code and data from modification using hardened enclaves with
+Intel SGX.
+
+For more details on the SGX feature, please follow resources in the SGX developer's
+document store. In order to use SGX with libvirt have a look at formatdomain.rst
+Memory devices.
+
+``flc``
+   FLC (Flexible Launch Control), not strictly part of SGX2, but was not part of
+   original SGX hardware either.
+
+``sgx1``
+   the sgx version 1.
+
+``sgx2``
+   The sgx version 2.
+
+``section_size``
+   The size of the SGX enclave page cache (called EPC).
+
+``sections``
+   The sections of the SGX enclave page cache (called EPC).
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 27f3fb8d36..fa29f69807 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -98,6 +98,7 @@ virDomainCapsDispose(void *obj)
     virObjectUnref(caps->cpu.custom);
     virCPUDefFree(caps->cpu.hostModel);
     virSEVCapabilitiesFree(caps->sev);
+    virSGXCapabilitiesFree(caps->sgx);
 
     values = &caps->os.loader.values;
     for (i = 0; i < values->nvalues; i++)
@@ -620,6 +621,52 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
     return;
 }
 
+static void
+virDomainCapsFeatureSGXFormat(virBuffer *buf,
+                              const virSGXCapability *sgx)
+{
+    size_t i;
+
+    if (!sgx) {
+        virBufferAddLit(buf, "<sgx supported='no'/>\n");
+    } else {
+        virBufferAddLit(buf, "<sgx supported='yes'>\n");
+        virBufferAdjustIndent(buf, 2);
+        if (sgx->flc) {
+            virBufferAsprintf(buf, "<flc>%s</flc>\n", "yes");
+        } else {
+            virBufferAsprintf(buf, "<flc>%s</flc>\n", "no");
+        }
+        if (sgx->sgx1) {
+            virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "yes");
+        } else {
+            virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "no");
+        }
+        if (sgx->sgx2) {
+            virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "yes");
+        } else {
+            virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "no");
+        }
+        virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
+
+        if (sgx->nSections > 0) {
+            virBufferAddLit(buf, "<sections>\n");
+
+            for (i = 0; i < sgx->nSections; i++) {
+                virBufferAdjustIndent(buf, 2);
+                virBufferAsprintf(buf, "<section node='%u' ", sgx->pSections[i].node);
+                virBufferAsprintf(buf, "size='%llu'/>\n", sgx->pSections[i].size);
+                virBufferAdjustIndent(buf, -2);
+            }
+            virBufferAddLit(buf, "</sections>\n");
+        }
+
+        virBufferAdjustIndent(buf, -2);
+        virBufferAddLit(buf, "</sgx>\n");
+    }
+
+    return;
+}
 
 static void
 virDomainCapsFormatFeatures(const virDomainCaps *caps,
@@ -640,6 +687,7 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps,
     }
 
     virDomainCapsFeatureSEVFormat(&childBuf, caps->sev);
+    virDomainCapsFeatureSGXFormat(&childBuf, caps->sgx);
 
     virXMLFormatElement(buf, "features", NULL, &childBuf);
 }
diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng
index 9cbc2467ab..6975ebacb9 100644
--- a/src/conf/schemas/domaincaps.rng
+++ b/src/conf/schemas/domaincaps.rng
@@ -270,6 +270,9 @@
       <optional>
         <ref name="sev"/>
       </optional>
+      <optional>
+        <ref name="sgx"/>
+      </optional>
     </element>
   </define>
 
@@ -330,6 +333,45 @@
     </element>
   </define>
 
+  <define name="sgx">
+    <element name="sgx">
+      <ref name="supported"/>
+      <optional>
+        <element name="flc">
+          <data type="string"/>
+        </element>
+        <element name="sgx1">
+          <data type="string"/>
+        </element>
+        <element name="sgx2">
+          <data type="string"/>
+        </element>
+        <element name="section_size">
+          <attribute name="unit">
+            <value>KiB</value>
+          </attribute>
+          <data type="unsignedInt"/>
+        </element>
+        <optional>
+          <element name="sections">
+            <interleave>
+              <zeroOrMore>
+                <element name="section">
+                  <attribute name="node">
+                    <data type="string"/>
+                  </attribute>
+                  <attribute name="size">
+                    <data type="string"/>
+                  </attribute>
+                </element>
+              </zeroOrMore>
+            </interleave>
+          </element>
+        </optional>
+      </optional>
+    </element>
+  </define>
+
   <define name="value">
     <zeroOrMore>
       <element name="value">
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 57b5acb150..598c694738 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6744,6 +6744,33 @@ virQEMUCapsFillDomainFeatureS390PVCaps(virQEMUCaps *qemuCaps,
     }
 }
 
+/**
+ * virQEMUCapsFillDomainFeatureiSGXCaps:
+ * @qemuCaps: QEMU capabilities
+ * @domCaps: domain capabilities
+ *
+ * Take the information about SGX capabilities that has been obtained
+ * using the 'query-sgx-capabilities' QMP command and stored in @qemuCaps
+ * and convert it to a form suitable for @domCaps.
+ */
+static void
+virQEMUCapsFillDomainFeatureSGXCaps(virQEMUCaps *qemuCaps,
+                                    virDomainCaps *domCaps)
+{
+    virSGXCapability *cap = qemuCaps->sgxCapabilities;
+
+    if (!cap)
+        return;
+
+    domCaps->sgx = g_new0(virSGXCapability, 1);
+
+    domCaps->sgx->flc = cap->flc;
+    domCaps->sgx->sgx1 = cap->sgx1;
+    domCaps->sgx->sgx2 = cap->sgx2;
+    domCaps->sgx->section_size = cap->section_size;
+    domCaps->sgx->nSections = cap->nSections;
+    domCaps->sgx->pSections = cap->pSections;
+}
 
 int
 virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps,
@@ -6796,6 +6823,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps,
     virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps);
     virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps);
     virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps);
+    virQEMUCapsFillDomainFeatureSGXCaps(qemuCaps, domCaps);
 
     return 0;
 }
diff --git a/tests/domaincapsdata/bhyve_basic.x86_64.xml b/tests/domaincapsdata/bhyve_basic.x86_64.xml
index 745f325531..dd054577c0 100644
--- a/tests/domaincapsdata/bhyve_basic.x86_64.xml
+++ b/tests/domaincapsdata/bhyve_basic.x86_64.xml
@@ -33,5 +33,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/bhyve_fbuf.x86_64.xml b/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
index bb11c02ae9..0b1d9c17d7 100644
--- a/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
+++ b/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
@@ -50,5 +50,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/bhyve_uefi.x86_64.xml b/tests/domaincapsdata/bhyve_uefi.x86_64.xml
index dfd2360d74..69fff197a7 100644
--- a/tests/domaincapsdata/bhyve_uefi.x86_64.xml
+++ b/tests/domaincapsdata/bhyve_uefi.x86_64.xml
@@ -42,5 +42,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/empty.xml b/tests/domaincapsdata/empty.xml
index d3e2d89b60..97752ca04a 100644
--- a/tests/domaincapsdata/empty.xml
+++ b/tests/domaincapsdata/empty.xml
@@ -13,5 +13,6 @@
   </devices>
   <features>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/libxl-xenfv.xml b/tests/domaincapsdata/libxl-xenfv.xml
index cc5b3847e2..c71d759517 100644
--- a/tests/domaincapsdata/libxl-xenfv.xml
+++ b/tests/domaincapsdata/libxl-xenfv.xml
@@ -76,5 +76,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/libxl-xenpv.xml b/tests/domaincapsdata/libxl-xenpv.xml
index 325f1e50b3..8ae2370b7e 100644
--- a/tests/domaincapsdata/libxl-xenpv.xml
+++ b/tests/domaincapsdata/libxl-xenpv.xml
@@ -66,5 +66,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
index ea9737d9ce..665e2b6401 100644
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
@@ -187,5 +187,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
index cccc6830f9..de19ae76e0 100644
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
@@ -200,5 +200,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
index 804bf8020e..5249aca8c1 100644
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
@@ -215,5 +215,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
index 3a8aa2ab71..3186231683 100644
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
@@ -187,5 +187,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
index 0dc5995c09..7aa4ba7d2c 100644
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
@@ -208,5 +208,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
index 575506d852..a08a9b6a8e 100644
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
@@ -218,5 +218,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
index 2074c89875..e4518988c6 100644
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
@@ -168,5 +168,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
index a93313f980..ff1158d107 100644
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
@@ -162,5 +162,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
index cb3edcbd56..681b4bc7bd 100644
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
@@ -132,5 +132,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
index 5c3d9ce7db..7f7b8a1911 100644
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
@@ -215,5 +215,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
index c8a5558536..32f1816ad6 100644
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
@@ -208,5 +208,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
index 4f80439eb4..740ff9062d 100644
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
@@ -204,5 +204,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
index 301101095c..09c4c07471 100644
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -216,5 +216,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
index 8605db5cc8..039ee5c99c 100644
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
@@ -134,5 +134,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
index f49b6907ff..63a128fab5 100644
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
@@ -222,5 +222,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
index 650728566e..a8cd693bbd 100644
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
@@ -204,5 +204,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index c4277c53a1..381cc9a4ec 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index 2a65cb0ad9..28868f1c0b 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
index 8035f7230a..3176d7044f 100644
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
@@ -134,5 +134,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 6e3ddda356..db9bb1dd9f 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index 8f3911b4b3..b99301af1f 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index a4dc7bafc9..da58e85b72 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index 7108efe3b4..65aa9403c5 100644
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
@@ -175,5 +175,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index 1e7db635d0..d3e2ac0621 100644
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
@@ -169,5 +169,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
index f109d36266..076820c5bc 100644
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
@@ -135,5 +135,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
index b810ad737a..821d467bd9 100644
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
@@ -232,5 +232,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index 24e732d9c3..3dac8ff1ae 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 3ee7feea48..2f9dc00689 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -213,5 +213,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index b20c02cb68..13540675b6 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -229,5 +229,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 0f1d398e2c..bb7d6b9219 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -213,5 +213,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
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 c8a77cdd41..9fef4ccd37 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -221,5 +221,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
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 d0ee3f7b7a..76636c0c37 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -236,5 +236,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 05d606967b..1a87fc417b 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -177,5 +177,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index f19ad5e6db..943c3605d8 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -171,5 +171,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 4c3a2c6d98..e0187041db 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -141,5 +141,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index fb162ea578..8150e5119a 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -247,5 +247,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 6578fd04b6..8f3edfce70 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -221,5 +221,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
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 8a6797c2f1..4c6ea67c99 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -223,5 +223,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx 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
index d277c96426..e0536347e5 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -238,5 +238,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index f8cea230d9..3a70b34001 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -186,5 +186,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index ab72b7ffeb..6a8c1027c0 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -180,5 +180,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index d196676b14..ec6c9d097a 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -147,5 +147,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx 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
index 51ca1d98e0..74f297c2e7 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -223,5 +223,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 3468fb2e72..ceafdd35e7 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 4f1ffbb2ba..ae9754a14c 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -238,5 +238,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
index 5c1c0c4680..ae8474a696 100644
--- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
@@ -113,5 +113,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 8ff49c7899..37d053c086 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 2301a475eb..4e68dc46f4 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 6cff0f815e..a8914a90b2 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -238,5 +238,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index a863a6052d..41bb7ecb45 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -186,5 +186,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index ab72b7ffeb..6a8c1027c0 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -180,5 +180,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index b2c0577be9..fa29ac8c23 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -147,5 +147,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index 2a2ca8abcf..496c08dd34 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -249,5 +249,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 41a54985d7..df653b95e3 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 4595e70f61..95627a1f9c 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -230,5 +230,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 65f4459bcb..4ac6365cad 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -244,5 +244,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 61eab9de0e..bda348ac18 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -187,5 +187,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index fa722b5fd3..d1478dedde 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -181,5 +181,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index 13fa3a637e..ccb6536dfc 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -250,5 +250,6 @@
     <backup supported='no'/>
     <s390-pv supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index a6fa374211..621cf5032c 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -230,5 +230,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index f4d0fcf673..93194d4f99 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 40bc875e3c..9828fb4192 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -239,5 +239,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 67fc449f5d..0948e9cf14 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 9d68c0a404..f23ce1180a 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -226,5 +226,11 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index a439dda190..e9530e76e5 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -240,5 +240,11 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index f6045623f5..7494df031f 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -189,5 +189,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index 35e18adcd5..2946a36b04 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -183,5 +183,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index b07072778b..fb92d1fc5a 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -145,5 +145,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 0f89790b60..6d20218543 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -226,5 +226,11 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 4e6ff06125..5eff1a0ff9 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -228,5 +228,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index ed80a7892f..bd3fe5cf25 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -242,5 +242,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
index 7a8cb9f113..514f673e4c 100644
--- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -189,5 +189,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
index d48c87dc3a..797affc12f 100644
--- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -183,5 +183,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index ec171bcdd9..73816bcd85 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -147,5 +147,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index a20395c6d4..2a77af73eb 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -228,5 +228,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 4e96c5104a..6de62c1707 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -227,5 +227,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 46542c8b5b..5f3017d6b5 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -240,5 +240,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 02b43e318f..3a982d4659 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -227,5 +227,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
-- 
2.25.1


From lin.a.yang at intel.com  Fri Jul  1 19:14:46 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:46 -0700
Subject: [libvirt][PATCH v13 6/6] qemu: Add command-line to generate SGX EPC
 memory backend
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <20220701191446.727066-7-lin.a.yang@intel.com>

According to the result parsing from xml, add the argument of
SGX EPC memory backend into QEMU command line.

With NUMA config:

    #qemu-system-x86_64 \
        ...... \
        -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
        -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \
        -machine sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1

Without NUMA config:

    #qemu-system-x86_64 \
        ...... \
        -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
        -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \
        -machine sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1

Signed-off-by: Lin Yang <lin.a.yang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Signed-off-by: Haibin Huang <haibin.huang at intel.com>
---
 src/qemu/qemu_alias.c                         |  3 +-
 src/qemu/qemu_command.c                       | 86 ++++++++++++++++++-
 src/qemu/qemu_monitor_json.c                  | 41 +++++++--
 .../sgx-epc-numa.x86_64-latest.args           | 40 +++++++++
 .../sgx-epc.x86_64-6.2.0.args                 | 37 ++++++++
 tests/qemuxml2argvtest.c                      |  3 +
 6 files changed, 198 insertions(+), 12 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 5ebeb82f92..7482ea3cc8 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -466,7 +466,8 @@ qemuDeviceMemoryGetAliasID(virDomainDef *def,
      * valid */
     if (!oldAlias &&
         mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM &&
-        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM)
+        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM &&
+        mem->model != VIR_DOMAIN_MEMORY_MODEL_SGX_EPC)
         return mem->info.addr.dimm.slot;
 
     for (i = 0; i < def->nmems; i++) {
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 7ca183ded7..fcfcc32df1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3743,6 +3743,10 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps,
         if (systemMemory)
             disableCanonicalPath = true;
 
+    } else if (mem->model == VIR_DOMAIN_MEMORY_MODEL_SGX_EPC) {
+        backendType = "memory-backend-epc";
+        if (!priv->memPrealloc)
+            prealloc = true;
     } else if (useHugepage || mem->nvdimmPath || memAccess ||
         def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {
 
@@ -6955,6 +6959,9 @@ qemuBuildMachineCommandLine(virCommand *cmd,
     virCPUDef *cpu = def->cpu;
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
     size_t i;
+    virSGXCapabilityPtr sgxCaps = NULL;
+    int epcNum = 0;
+    int targetNode;
 
     virCommandAddArg(cmd, "-machine");
     virBufferAdd(&buf, def->os.machine, -1);
@@ -7176,6 +7183,61 @@ qemuBuildMachineCommandLine(virCommand *cmd,
         virBufferAddLit(&buf, ",graphics=off");
     }
 
+    /* add sgx epc memory to -machine parameter */
+    sgxCaps = virQEMUCapsGetSGXCapabilities(qemuCaps);
+    for (i = 0; i < def->nmems; i++) {
+        switch (def->mems[i]->model) {
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            targetNode = def->mems[i]->targetNode;
+
+            if (targetNode >= (int) virDomainNumaGetNodeCount(def->numa)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("can't add sgx epc for guest node '%d' as "
+                                 "the guest has only '%zu' NUMA nodes configured"),
+                               targetNode, virDomainNumaGetNodeCount(def->numa));
+                return -1;
+            }
+
+            if (sgxCaps->nSections == 0) {
+                /* Assume QEMU cannot specify guest NUMA node for each SGX EPC,
+                 * because it doesn't provide EPC NUMA info
+                 */
+                if (targetNode > 0) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                   _("can't add SGX EPC for guest node '%d' because "
+                                     "this QEMU version didn't provide SGX EPC NUMA info"),
+                                   targetNode);
+                    return -1;
+                }
+
+                virBufferAsprintf(&buf, ",sgx-epc.%d.memdev=mem%s", epcNum,
+                                  def->mems[i]->info.alias);
+            } else if (sgxCaps->nSections > 0) {
+                /* The .node attribute is required since QEMU provide EPC NUMA info */
+                if (targetNode < 0)
+                    /* set NUMA target node to 0 by default if user doesn't
+                     * specify it
+                     */
+                    targetNode = 0;
+
+                virBufferAsprintf(&buf, ",sgx-epc.%d.memdev=mem%s,sgx-epc.%d.node=%d",
+                                  epcNum, def->mems[i]->info.alias, epcNum, targetNode);
+            }
+
+            epcNum++;
+
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+        case VIR_DOMAIN_MEMORY_MODEL_NONE:
+        case VIR_DOMAIN_MEMORY_MODEL_LAST:
+            break;
+        }
+    }
+
     virCommandAddArgBuffer(cmd, &buf);
 
     return 0;
@@ -7772,11 +7834,27 @@ qemuBuildMemoryDeviceCommandLine(virCommand *cmd,
         if (qemuBuildMemoryDimmBackendStr(cmd, def->mems[i], def, cfg, priv) < 0)
             return -1;
 
-        if (!(props = qemuBuildMemoryDeviceProps(cfg, priv, def, def->mems[i])))
-            return -1;
+        switch (def->mems[i]->model) {
+        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+            if (!(props = qemuBuildMemoryDeviceProps(cfg, priv, def, def->mems[i])))
+                return -1;
 
-        if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, priv->qemuCaps) < 0)
-            return -1;
+            if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, priv->qemuCaps) < 0)
+                return -1;
+
+            break;
+
+        /* sgx epc memory will be added to -machine parameter, so skip here */
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_NONE:
+        case VIR_DOMAIN_MEMORY_MODEL_LAST:
+            break;
+        }
     }
 
     return 0;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index c900956f82..108643512c 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -7606,13 +7606,25 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon,
             return -1;
         }
 
-        /* While 'id' attribute is marked as optional in QEMU's QAPI
-         * specification, Libvirt always sets it. Thus we can fail if not
-         * present. */
-        if (!(devalias = virJSONValueObjectGetString(dimminfo, "id"))) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("dimm memory info data is missing 'id'"));
-            return -1;
+        if (STREQ(type, "dimm") || STREQ(type, "nvdimm") || STREQ(type, "virtio-mem")) {
+            /* While 'id' attribute is marked as optional in QEMU's QAPI
+            * specification, Libvirt always sets it. Thus we can fail if not
+            * present. */
+            if (!(devalias = virJSONValueObjectGetString(dimminfo, "id"))) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                            _("dimm memory info data is missing 'id'"));
+                return -1;
+            }
+        } else if (STREQ(type, "sgx-epc")) {
+            if (!(devalias = virJSONValueObjectGetString(dimminfo, "memdev"))) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                            _("sgx-epc memory info data is missing 'memdev'"));
+                return -1;
+            }
+        } else {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("%s memory device info is not handled yet"), type);
+                return -1;
         }
 
         meminfo = g_new0(qemuMonitorMemoryDeviceInfo, 1);
@@ -7656,6 +7668,21 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon,
                                _("malformed/missing size in virtio memory info"));
                 return -1;
             }
+        } else if (STREQ(type, "sgx-epc")) {
+            /* sgx-epc memory devices */
+            if (virJSONValueObjectGetNumberUlong(dimminfo, "memaddr",
+                                                 &meminfo->address) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("malformed/missing memaddr in sgx-epc memory info"));
+                return -1;
+            }
+
+            if (virJSONValueObjectGetNumberUlong(dimminfo, "size",
+                                                 &meminfo->size) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("malformed/missing size in sgx-epc memory info"));
+                return -1;
+            }
         } else {
             /* type not handled yet */
             continue;
diff --git a/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args b/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
new file mode 100644
index 0000000000..59c1041679
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine q35,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1 \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.1","addr":"0x0"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
new file mode 100644
index 0000000000..56c476b777
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
@@ -0,0 +1,37 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1 \
+-accel tcg \
+-cpu qemu64 \
+-m 134 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":140509184}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,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 48dd20458e..a2f488dff0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3461,6 +3461,9 @@ mymain(void)
     /* HVF guests should not work on Linux with KVM */
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hvf-x86_64-q35-headless");
 
+    DO_TEST_CAPS_VER("sgx-epc", "6.2.0");
+    DO_TEST_CAPS_LATEST("sgx-epc-numa");
+
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(fakerootdir);
 
-- 
2.25.1


From lin.a.yang at intel.com  Fri Jul  1 19:14:42 2022
From: lin.a.yang at intel.com (Lin Yang)
Date: Fri,  1 Jul 2022 12:14:42 -0700
Subject: [libvirt][PATCH v13 2/6] Get SGX capabilities form QMP
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <20220701191446.727066-3-lin.a.yang@intel.com>

From: Haibin Huang <haibin.huang at intel.com>

Generate the QMP command for query-sgx-capabilities and the command
return sgx capabilities from QMP.

{"execute":"query-sgx-capabilities"}

the right reply:
  {"return":
    {
      "sgx": true,
      "section-size": 197132288,
      "flc": true
    }
  }

the error reply:
  {"error":
    {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
  }

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Signed-off-by: Haibin Huang <haibin.huang at intel.com>
---
 src/qemu/qemu_monitor.c      |  10 ++++
 src/qemu/qemu_monitor.h      |   3 +
 src/qemu/qemu_monitor_json.c | 113 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   4 ++
 4 files changed, 130 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fda5d2f368..a1b2138921 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3653,6 +3653,16 @@ qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
 }
 
 
+int
+qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
+                              virSGXCapability **capabilities)
+{
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONGetSGXCapabilities(mon, capabilities);
+}
+
+
 int
 qemuMonitorNBDServerStart(qemuMonitor *mon,
                           const virStorageNetHostDef *server,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 95267ec6c7..451ac8eec9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -864,6 +864,9 @@ int qemuMonitorGetGICCapabilities(qemuMonitor *mon,
 int qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
                                   virSEVCapability **capabilities);
 
+int qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
+                                  virSGXCapability **capabilities);
+
 typedef enum {
   QEMU_MONITOR_MIGRATE_BACKGROUND       = 1 << 0,
   QEMU_MONITOR_MIGRATE_NON_SHARED_DISK  = 1 << 1, /* migration with non-shared storage with full disk copy */
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 3aad2ab212..c900956f82 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6445,6 +6445,119 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
     return 1;
 }
 
+
+/**
+ * qemuMonitorJSONGetSGXCapabilities:
+ * @mon: qemu monitor object
+ * @capabilities: pointer to pointer to a SGX capability structure to be filled
+ *
+ * This function queries and fills in INTEL's SGX platform-specific data.
+ * Note that from QEMU's POV both -object sgx-epc and query-sgx-capabilities
+ * can be present even if SGX is not available, which basically leaves us with
+ * checking for JSON "GenericError" in order to differentiate between compiled-in
+ * support and actual SGX support on the platform.
+ *
+ * Returns: -1 on error,
+ *           0 if SGX is not supported, and
+ *           1 if SGX is supported on the platform.
+ */
+int
+qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
+                                  virSGXCapability **capabilities)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    g_autoptr(virSGXCapability) capability = NULL;
+
+    virJSONValue *sections = NULL;
+    virJSONValue *caps;
+    bool flc = false;
+    bool sgx1 = false;
+    bool sgx2 = false;
+    unsigned long long section_size = 0;
+    unsigned long long size;
+    size_t i;
+
+    *capabilities = NULL;
+    capability = g_new0(virSGXCapability, 1);
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities", NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    /* QEMU has only compiled-in support of SGX */
+    if (qemuMonitorJSONHasError(reply, "GenericError"))
+        return 0;
+
+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+        return -1;
+
+    caps = virJSONValueObjectGetObject(reply, "return");
+
+    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'flc' field"));
+        return -1;
+    }
+    capability->flc = flc;
+
+    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
+        return -1;
+    }
+    capability->sgx1 = sgx1;
+
+    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
+        return -1;
+    }
+    capability->sgx2 = sgx2;
+
+    if (virJSONValueObjectGetNumberUlong(caps, "section-size", &section_size) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'section-size' field"));
+        return -1;
+    }
+    capability->section_size = section_size/1024;
+
+    if (!(sections = virJSONValueObjectGetArray(caps, "sections"))) {
+        capability->nSections = 0;
+        capability->pSections = NULL;
+        VIR_INFO("Sections was not obtained, so QEMU version is 6.2.0");
+        *capabilities = g_steal_pointer(&capability);
+        return 1;
+    }
+
+    // Got the section, the QEMU version is above 7.0.0
+    capability->nSections = virJSONValueArraySize(sections);
+    capability->pSections = g_new0(virSection, capability->nSections + 1);
+
+    for (i = 0; i < capability->nSections; i++) {
+        virJSONValue *elem = virJSONValueArrayGet(sections, i);
+
+        if (virJSONValueObjectGetNumberUlong(elem, "size", &size) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("query-sgx-capabilities reply was missing 'size' field"));
+            return -1;
+        }
+        capability->pSections[i].size = size/1024;
+
+        if (virJSONValueObjectGetNumberUint(elem, "node", &(capability->pSections[i].node)) < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("query-sgx-capabilities reply was missing 'node' field"));
+            return -1;
+        }
+    }
+
+    *capabilities = g_steal_pointer(&capability);
+    return 1;
+}
+
+
 static virJSONValue *
 qemuMonitorJSONBuildInetSocketAddress(const char *host,
                                       const char *port)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index ad3853ae69..442ce00319 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -190,6 +190,10 @@ int
 qemuMonitorJSONGetGICCapabilities(qemuMonitor *mon,
                                   virGICCapability **capabilities);
 
+int
+qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
+                                  virSGXCapability **capabilities);
+
 int
 qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
                                   virSEVCapability **capabilities);
-- 
2.25.1


From twiederh at redhat.com  Mon Jul  4 08:10:08 2022
From: twiederh at redhat.com (Tim Wiederhake)
Date: Mon,  4 Jul 2022 10:10:08 +0200
Subject: [libvirt PATCH] [pushed] Fix spelling
Message-ID: <20220704081008.15554-1-twiederh@redhat.com>

Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 docs/kbase/secureboot.rst | 2 +-
 src/qemu/qemu_migration.c | 2 +-
 src/rpc/virnetmessage.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/kbase/secureboot.rst b/docs/kbase/secureboot.rst
index ebd9d56da8..8f151c1f2a 100644
--- a/docs/kbase/secureboot.rst
+++ b/docs/kbase/secureboot.rst
@@ -49,7 +49,7 @@ snippet:
   </os>
 
 Versions older than 7.2.0 require manually providing all information
-about the firmware and are not covered here. Plese refer to `the
+about the firmware and are not covered here. Please refer to `the
 relevant documentation
 <../formatdomain.html#operating-system-booting>`__ for details.
 
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 368995085f..9c3fd41761 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2726,7 +2726,7 @@ qemuMigrationAnyCanResume(virDomainObj *vm,
 
     /* This should never happen since POSTCOPY_RESUME is newer than
      * CHANGE_PROTECTION, but let's check it anyway in case we're talking to
-     * a weired client.
+     * a weird client.
      */
     if (job == VIR_ASYNC_JOB_MIGRATION_OUT &&
         expectedPhase < QEMU_MIGRATION_PHASE_PERFORM_RESUME &&
diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c
index d298d30d57..ceba1a5a8e 100644
--- a/src/rpc/virnetmessage.c
+++ b/src/rpc/virnetmessage.c
@@ -437,7 +437,7 @@ int virNetMessageDecodePayload(virNetMessage *msg,
  * virNetMessageEncodePayloadRaw:
  * @msg: message to encode payload into
  * @data: data to encode into @msg
- * @len: lenght of @data
+ * @len: length of @data
  *
  * Encodes message payload. If @data is NULL or @len is 0 an empty message is
  * encoded.
-- 
2.36.1


From mprivozn at redhat.com  Mon Jul  4 11:09:09 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon,  4 Jul 2022 13:09:09 +0200
Subject: [PATCH 0/3] IOMMU improvements
Message-ID: <cover.1656932858.git.mprivozn@redhat.com>

These are inspired by:

https://bugzilla.redhat.com/show_bug.cgi?id=2101633

While there are some missing info to fix the actual but, I've noticed
couple of areas for improvement while investigating the bug.

Michal Pr?vozn?k (3):
  qemu_domain_address: Drop needless virDomainIOMMUModel typecast
  docs: Document <address/> for IOMMU device
  domain_validate: Disallow non-virtio IOMMU with an <address/>

 docs/formatdomain.rst          |  3 +++
 src/conf/domain_validate.c     | 25 ++++++++++++++++++++++++-
 src/qemu/qemu_domain_address.c |  4 ++--
 3 files changed, 29 insertions(+), 3 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Mon Jul  4 11:09:10 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon,  4 Jul 2022 13:09:10 +0200
Subject: [PATCH 1/3] qemu_domain_address: Drop needless virDomainIOMMUModel
 typecast
In-Reply-To: <cover.1656932858.git.mprivozn@redhat.com>
References: <cover.1656932858.git.mprivozn@redhat.com>
Message-ID: <7b9d937bc47363e15d6f17ea3c6fc714ce5f61d6.1656932858.git.mprivozn@redhat.com>

There are two places where the @model member of
_virDomainIOMMUDef struct is typecasted to virDomainIOMMUModel
which is completely unnecessary because the struct already
defines the member of that type.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_domain_address.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 753733d1b9..026be99ba9 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -1003,7 +1003,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
         break;
 
     case VIR_DOMAIN_DEVICE_IOMMU:
-        switch ((virDomainIOMMUModel) dev->data.iommu->model) {
+        switch (dev->data.iommu->model) {
             case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
                 return virtioFlags | VIR_PCI_CONNECT_INTEGRATED;
 
@@ -2384,7 +2384,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,
     if (def->iommu) {
         virDomainIOMMUDef *iommu = def->iommu;
 
-        switch ((virDomainIOMMUModel) iommu->model) {
+        switch (iommu->model) {
         case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
             if (virDeviceInfoPCIAddressIsWanted(&iommu->info) &&
                 qemuDomainPCIAddressReserveNextAddr(addrs, &iommu->info) < 0) {
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul  4 11:09:12 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon,  4 Jul 2022 13:09:12 +0200
Subject: [PATCH 3/3] domain_validate: Disallow non-virtio IOMMU with an
 <address/>
In-Reply-To: <cover.1656932858.git.mprivozn@redhat.com>
References: <cover.1656932858.git.mprivozn@redhat.com>
Message-ID: <a2e1a9f7488e528d7c87c6204aa32a4a285b6066.1656932858.git.mprivozn@redhat.com>

Per v8.3.0-rc1~199 it's only a virtio IOMMU that can have
<address/>. The rest (Intel and SMMUv3) are system devices and
thus have no address associated with them. However, this
assumption is never checked for.

Fixes: b0eb1e193f5db033d0fbbf91ff71a121066ad77c
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_validate.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index c977c39144..d35451c26a 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2582,6 +2582,27 @@ virDomainGraphicsDefValidate(const virDomainDef *def,
     return 0;
 }
 
+static int
+virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
+{
+    switch (iommu->model) {
+    case VIR_DOMAIN_IOMMU_MODEL_INTEL:
+    case VIR_DOMAIN_IOMMU_MODEL_SMMUV3:
+        if (iommu->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("iommu model '%s' can't have address"),
+                           virDomainIOMMUModelTypeToString(iommu->model));
+            return -1;
+        }
+        break;
+
+    case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
+    case VIR_DOMAIN_IOMMU_MODEL_LAST:
+    }
+
+    return 0;
+}
+
 static int
 virDomainDeviceInfoValidate(const virDomainDeviceDef *dev)
 {
@@ -2683,6 +2704,9 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
     case VIR_DOMAIN_DEVICE_GRAPHICS:
         return virDomainGraphicsDefValidate(def, dev->data.graphics);
 
+    case VIR_DOMAIN_DEVICE_IOMMU:
+        return virDomainIOMMUDefValidate(dev->data.iommu);
+
     case VIR_DOMAIN_DEVICE_LEASE:
     case VIR_DOMAIN_DEVICE_WATCHDOG:
     case VIR_DOMAIN_DEVICE_HUB:
@@ -2690,7 +2714,6 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
     case VIR_DOMAIN_DEVICE_NVRAM:
     case VIR_DOMAIN_DEVICE_TPM:
     case VIR_DOMAIN_DEVICE_PANIC:
-    case VIR_DOMAIN_DEVICE_IOMMU:
     case VIR_DOMAIN_DEVICE_NONE:
     case VIR_DOMAIN_DEVICE_LAST:
         break;
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul  4 11:09:11 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon,  4 Jul 2022 13:09:11 +0200
Subject: [PATCH 2/3] docs: Document <address/> for IOMMU device
In-Reply-To: <cover.1656932858.git.mprivozn@redhat.com>
References: <cover.1656932858.git.mprivozn@redhat.com>
Message-ID: <3986af03270a4ded34feabb85ae5b216ee9559f1.1656932858.git.mprivozn@redhat.com>

The commit v8.3.0-rc1~199 introduced <address/> to <iommu/>
device. And while it updated the RNG it forgot to update the
docs. Fix that.

Fixes: b0eb1e193f5db033d0fbbf91ff71a121066ad77c
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomain.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 62a94890f0..a4e3c39928 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -8083,6 +8083,9 @@ Example:
       mapping larger iova addresses in the guest. :since:`Since 6.5.0` (QEMU/KVM
       only)
 
+The ``virtio`` IOMMU devices can further have ``address`` element as described
+in `Device addresses`_ (address has to by type of ``pci``).
+
 
 Vsock
 ~~~~~
-- 
2.35.1


From jtomko at redhat.com  Mon Jul  4 11:17:52 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Mon, 4 Jul 2022 13:17:52 +0200
Subject: [PATCH 0/3] IOMMU improvements
In-Reply-To: <cover.1656932858.git.mprivozn@redhat.com>
References: <cover.1656932858.git.mprivozn@redhat.com>
Message-ID: <YsLMYAMIHWC0MxdF@mjch>

On a Monday in 2022, Michal Privoznik wrote:
>These are inspired by:
>
>https://bugzilla.redhat.com/show_bug.cgi?id=2101633
>
>While there are some missing info to fix the actual but, I've noticed
>couple of areas for improvement while investigating the bug.
>
>Michal Pr?vozn?k (3):
>  qemu_domain_address: Drop needless virDomainIOMMUModel typecast
>  docs: Document <address/> for IOMMU device
>  domain_validate: Disallow non-virtio IOMMU with an <address/>
>
> docs/formatdomain.rst          |  3 +++
> src/conf/domain_validate.c     | 25 ++++++++++++++++++++++++-
> src/qemu/qemu_domain_address.c |  4 ++--
> 3 files changed, 29 insertions(+), 3 deletions(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220704/a1a15923/attachment.sig>

From mkletzan at redhat.com  Mon Jul  4 11:19:27 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Mon, 4 Jul 2022 13:19:27 +0200
Subject: Incomplete information in the website Wiki for libvirt.org
In-Reply-To: <CAG3gYV7-2-uVAWVt_S8yN+AEbQHQ-d+zgfyZMW371vREa7snnA@mail.gmail.com>
References: <CAG3gYV7-2-uVAWVt_S8yN+AEbQHQ-d+zgfyZMW371vREa7snnA@mail.gmail.com>
Message-ID: <YsLMv/hlsARB6JKI@wheatley>

On Fri, Jul 01, 2022 at 04:37:55AM -0500, Uriel Emmanuel Pelaez Hern?ndez wrote:
>Dear Web Marster from wiki.libvirt.org,
>
>I tried to look for the libvirtd, the demon that is suppose to run under
>Linux/Unix environment,
>but your site didn't show any information. Only a statement appeared:
>"Create the page libvirtd "
>

Hi, we are slowly migrating the wiki pages to knowledge base articles
due to various issues with the wiki.

>Please, update your site or suggest any other weblink with the information.
>

Have a look at our docs page: https://libvirt.org/docs.html where you
might find what you are looking for.  There is a particular page about
daemons here: https://libvirt.org/daemons.html

>In theory CygWin use your package, but the information is incomplete too,
>about this issue.
>
>I send this mail to these both Email address by the information displayed
>in your wiki, about the contact address to solve this kind of problems.
>

Unfortunately I am not sure what are you trying to solve, so I don't
know what clearer pointers to give you.

>By now, Google Service in my region is deprecated, so the information that
>the WebBrowser display is not the best.
>
>I send this request from my Email of Graduated Student form the University
>domain.
>
>Best Regards,
>Mr. Pel?ez Uriel.
>Mexico City

Have a nice day,
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220704/eb796c2c/attachment.sig>

From mprivozn at redhat.com  Mon Jul  4 13:49:25 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon,  4 Jul 2022 15:49:25 +0200
Subject: [PATCH] domain_validate: Properly terminate switch() in
 virDomainIOMMUDefValidate()
Message-ID: <35609616a2353d23b43d6c490daed333f60c917c.1656942551.git.mprivozn@redhat.com>

In my previous commit I've introduced virDomainIOMMUDefValidate()
function with a switch() statement. However, two cases in it,
though empty, were not terminated with a break statement which
made compiler complain.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---

Merged under trivial rule.

 src/conf/domain_validate.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index d35451c26a..57d4e63a26 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2598,6 +2598,7 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
 
     case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
     case VIR_DOMAIN_IOMMU_MODEL_LAST:
+        break;
     }
 
     return 0;
-- 
2.35.1


From natto at weirdnatto.in  Tue Jul  5 23:26:26 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Wed,  6 Jul 2022 04:56:26 +0530
Subject: [PATCH RFC v2 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <20220705232628.1779286-1-natto@weirdnatto.in>
References: <20220705232628.1779286-1-natto@weirdnatto.in>
Message-ID: <20220705232628.1779286-2-natto@weirdnatto.in>

Related: https://gitlab.com/libvirt/libvirt/-/issues/276

This patch adds an API for the "query-stats" QMP command.

The query returns a JSON containing the statistics based on the target,
which can either be vCPU or VM, and the providers. The API deserializes
the query result into an array of GHashMaps, which can later be used to
extract all the query statistics. GHashMaps are used to avoid traversing
the entire array to find the statistics you are looking for. This would
be a singleton array if the target is a VM since the returned JSON is
also a singleton array in that case.

Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
---
 src/qemu/qemu_monitor.c      | 106 ++++++++++++++++++++++++++++
 src/qemu/qemu_monitor.h      |  56 +++++++++++++++
 src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   6 ++
 4 files changed, 298 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fda5d2f3..528aed49 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4541,3 +4541,109 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONMigrateRecover(mon, uri);
 }
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
+              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
+              "vm",
+              "vcpu",
+);
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsVmName,
+              QEMU_MONITOR_QUERY_STATS_VM_NAME_LAST,
+);
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsVcpuName,
+              QEMU_MONITOR_QUERY_STATS_VCPU_NAME_LAST,
+              "halt_poll_success_ns",
+              "halt_poll_fail_ns"
+);
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
+              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
+              "kvm",
+);
+
+const char *
+qemuMonitorQueryStatsNameTypeToString(qemuMonitorQueryStatsTargetType target,
+                                      int type)
+{
+    switch (target) {
+    case QEMU_MONITOR_QUERY_STATS_TARGET_VM:
+        return qemuMonitorQueryStatsVmNameTypeToString(type);
+    case QEMU_MONITOR_QUERY_STATS_TARGET_VCPU:
+        return qemuMonitorQueryStatsVcpuNameTypeToString(type);
+
+    /* unreachable */
+    case QEMU_MONITOR_QUERY_STATS_TARGET_LAST:
+        ;
+    }
+
+    return NULL;
+}
+
+void
+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
+{
+    virBitmapFree(provider->names);
+    g_free(provider);
+}
+
+qemuMonitorQueryStatsProvider *
+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsTargetType target,
+                                 qemuMonitorQueryStatsProviderType provider_type,
+                                 ...)
+{
+    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
+    va_list name_list;
+    int stat;
+
+    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
+    provider->provider = provider_type;
+    provider->names = NULL;
+
+    va_start(name_list, provider_type);
+    stat = va_arg(name_list, int);
+
+    if (stat != -1) {
+        size_t sz = 0;
+
+        switch (target) {
+        case QEMU_MONITOR_QUERY_STATS_TARGET_VM:
+            sz = QEMU_MONITOR_QUERY_STATS_VM_NAME_LAST;
+            break;
+        case QEMU_MONITOR_QUERY_STATS_TARGET_VCPU:
+            sz = QEMU_MONITOR_QUERY_STATS_VCPU_NAME_LAST;
+            break;
+        case QEMU_MONITOR_QUERY_STATS_TARGET_LAST:
+            break;
+        }
+
+        provider->names = virBitmapNew(sz);
+
+        while (stat != -1) {
+            if (virBitmapSetBit(provider->names, stat) < 0)
+                return NULL;
+            stat = va_arg(name_list, int);
+        }
+    }
+
+    va_end(name_list);
+
+    return g_steal_pointer(&provider);
+}
+
+GPtrArray *
+qemuMonitorQueryStats(qemuMonitor *mon,
+                      qemuMonitorQueryStatsTargetType target,
+                      char **vcpus,
+                      GPtrArray *providers)
+{
+    VIR_DEBUG("target=%u vcpus=%p providers=%p", target, vcpus, providers);
+
+    QEMU_CHECK_MONITOR_NULL(mon);
+
+    if (target != QEMU_MONITOR_QUERY_STATS_TARGET_VCPU && !vcpus)
+        return NULL;
+
+    return qemuMonitorJSONQueryStats(mon, target, vcpus, providers);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 95267ec6..26df9c63 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1554,3 +1554,59 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorMigrateRecover(qemuMonitor *mon,
                           const char *uri);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_TARGET_VM,
+    QEMU_MONITOR_QUERY_STATS_TARGET_VCPU,
+    QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
+} qemuMonitorQueryStatsTargetType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsTarget);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_VM_NAME_LAST,
+} qemuMonitorQueryStatsVmNameType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsVmName);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS,
+    QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS,
+    QEMU_MONITOR_QUERY_STATS_VCPU_NAME_LAST,
+} qemuMonitorQueryStatsVcpuNameType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsVcpuName);
+
+const char *
+qemuMonitorQueryStatsNameTypeToString(qemuMonitorQueryStatsTargetType target,
+                                      int type);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
+    QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
+} qemuMonitorQueryStatsProviderType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsProvider);
+
+typedef struct _qemuMonitorQueryStatsProvider qemuMonitorQueryStatsProvider;
+struct _qemuMonitorQueryStatsProvider {
+    qemuMonitorQueryStatsProviderType provider;
+    virBitmap *names;
+};
+
+void
+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider);
+
+qemuMonitorQueryStatsProvider *
+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsTargetType target,
+                                 qemuMonitorQueryStatsProviderType provider_type,
+                                 ...);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorQueryStatsProvider,
+                              qemuMonitorQueryStatsProviderFree);
+
+GPtrArray *
+qemuMonitorQueryStats(qemuMonitor *mon,
+                      qemuMonitorQueryStatsTargetType target,
+                      char **vcpus,
+                      GPtrArray *providers);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 3aad2ab2..8774b1ff 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -9006,3 +9006,133 @@ qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONCheckError(cmd, reply);
 }
+
+static GPtrArray *
+qemuMonitorJSONExtractQueryStats(virJSONValue *arr)
+{
+    g_autoptr(GPtrArray) queried_stats = NULL;
+    size_t nstats = virJSONValueArraySize(arr);
+    size_t i;
+
+    /* Create a GPtrArray for GHashTables */
+    queried_stats = g_ptr_array_new_full(nstats, (GDestroyNotify) g_hash_table_destroy);
+
+    for (i = 0; i < nstats; i++) {
+        virJSONValue *obj = virJSONValueArrayGet(arr, i);
+        virJSONValue *stats = virJSONValueObjectGetArray(obj, "stats");
+        size_t j;
+
+        /* Create a GHashTable for virJSONValues */
+        GHashTable *hash_table = virHashNew((GDestroyNotify) virJSONValueFree);
+
+        for (j = 0; j < virJSONValueArraySize(stats); j++) {
+            virJSONValue *stat = virJSONValueArrayGet(stats, j);
+
+            g_hash_table_insert(hash_table,
+                                g_strdup(virJSONValueObjectGetString(stat, "name")),
+                                virJSONValueObjectGet(stat, "value"));
+        }
+
+        g_ptr_array_add(queried_stats, hash_table);
+    }
+
+    return g_steal_pointer(&queried_stats);
+}
+
+
+/**
+ * qemuMonitorJSONQueryStats:
+ * @mon: monitor object
+ * @target: the target type for the query
+ * @vcpus: a list of vCPU QOM paths for filtering the statistics
+ * @providers: an array of providers to filter statistics
+ *
+ * @vcpus is a NULL terminated array of strings. @providers is a GPtrArray
+ * for qemuMonitorQueryStatsProvider.
+ * @vcpus and @providers are optional and can be NULL.
+ *
+ * Queries for the @target based statistics.
+ * Returns a GPtrArray of GHashTables containing the statistics on success or
+ * NULL on failure.
+ */
+
+GPtrArray *
+qemuMonitorJSONQueryStats(qemuMonitor *mon,
+                          qemuMonitorQueryStatsTargetType target,
+                          char **vcpus,
+                          GPtrArray *providers)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    g_autoptr(virJSONValue) vcpu_list = NULL;
+    g_autoptr(virJSONValue) provider_list = NULL;
+    virJSONValue *rv = NULL;
+
+    size_t i;
+
+    if (providers) {
+        provider_list = virJSONValueNewArray();
+
+        for (i = 0; i < providers->len; i++) {
+            g_autoptr(virJSONValue) provider_obj = virJSONValueNewObject();
+            qemuMonitorQueryStatsProvider *provider = providers->pdata[i];
+            const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->provider);
+            virBitmap *names = provider->names;
+            int rc;
+
+            rc = virJSONValueObjectAppendString(provider_obj, "provider", type_str);
+
+            if (rc < 0)
+                return NULL;
+
+            if (names) {
+                g_autoptr(virJSONValue) provider_names = virJSONValueNewArray();
+                int curBit = virBitmapNextSetBit(names, -1);
+
+                while (curBit >= 0) {
+                    const char *name = qemuMonitorQueryStatsNameTypeToString(target, curBit);
+
+                    if (virJSONValueArrayAppendString(provider_names, name) < 0)
+                        return NULL;
+
+                    curBit = virBitmapNextSetBit(names, curBit);
+                }
+
+                rc = virJSONValueObjectAppend(provider_obj, "names", &provider_names);
+
+                if (rc < 0)
+                    return NULL;
+            }
+
+            if (virJSONValueArrayAppend(provider_list, &provider_obj) < 0)
+                return NULL;
+        }
+    }
+
+    if (vcpus) {
+        vcpu_list = virJSONValueNewArray();
+
+        for (i = 0; vcpus[i]; i++)
+            if (virJSONValueArrayAppendString(vcpu_list, vcpus[i]) < 0)
+                return NULL;
+    }
+
+    cmd = qemuMonitorJSONMakeCommand("query-stats",
+                                     "s:target", qemuMonitorQueryStatsTargetTypeToString(target),
+                                     "A:vcpus", &vcpu_list,
+                                     "A:providers", &provider_list,
+                                     NULL);
+
+    if (!cmd)
+        return NULL;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return NULL;
+
+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+        return NULL;
+
+    rv = virJSONValueObjectStealArray(reply, "return");
+
+    return qemuMonitorJSONExtractQueryStats(rv);
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index ad3853ae..db8dec80 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -878,3 +878,9 @@ qemuMonitorJSONChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
                               const char *uri);
+
+GPtrArray *
+qemuMonitorJSONQueryStats(qemuMonitor *mon,
+                          qemuMonitorQueryStatsTargetType target,
+                          char **vcpus,
+                          GPtrArray *providers);
-- 
2.36.1


From natto at weirdnatto.in  Tue Jul  5 23:26:25 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Wed,  6 Jul 2022 04:56:25 +0530
Subject: [PATCH RFC v2 0/3] qemu: add an API for "query-stats" QMP command
Message-ID: <20220705232628.1779286-1-natto@weirdnatto.in>

QEMU is gaining introspectable statistics which can be queried via the
"query-stats" QMP command. This patchset aims to add an API for the
same.

The returned JSON for "query-stats" is an array of objects containing
their own respective array of statistics.

Patch 1 adds the API which returns the deserialized JSON in the form of
a GPtrArray of GHashTables.

Patch 2 adds the "query-stats" to QEMU capabilities.

Patch 3 uses the API to query the halt poll success time and the halt
poll failure time.

v1 -> v2
========
I have been tinkering with the v1 patchset and have rewrote the v2
patches a couple of times. I believe the current patchset is still not
perfect and would appreciate some reviews.

I have another patch or two written but they do not make any significant
changes to the current patchset.

[1/3]:
  - use virBitmap instead of an array of strings for statistics.
  - add enums for the stat names and add
    qemuMonitorQueryStatsNameTypeToString to switch between the
    "ToString" functions based on the target type.
  - change qemuMonitorQueryStatsProviderNew to a variadic function that
    takes stat enum values with the sentinel value being -1.

[2/3]:
  - No changes

[3/3]:
  - Add relevant monitor related checks to check if the domain is
    active.
  - Acquire and release qemuMonitorObj lock before and after calling
    qemuMonitorQueryStats respectively.
  - Add the check for privileged access.

Relevant QEMU patches can be found here:
https://lore.kernel.org/all/20220530150714.756954-1-pbonzini at redhat.com/

This patchset is part of the 2022 GSOC contributor project.

Amneesh Singh (3):
  qemu_monitor: add qemuMonitorQueryStats
  qemu_capabilities: add "query-stats" QMP command to the QEMU
    capabilities
  qemu_driver: use qemuMonitorQueryStats to extract halt poll time

 src/qemu/qemu_capabilities.c |   2 +
 src/qemu/qemu_capabilities.h |   1 +
 src/qemu/qemu_driver.c       |  70 ++++++++++++++++---
 src/qemu/qemu_monitor.c      | 106 ++++++++++++++++++++++++++++
 src/qemu/qemu_monitor.h      |  56 +++++++++++++++
 src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   6 ++
 7 files changed, 363 insertions(+), 8 deletions(-)

-- 
2.36.1


From natto at weirdnatto.in  Tue Jul  5 23:26:27 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Wed,  6 Jul 2022 04:56:27 +0530
Subject: [PATCH RFC v2 2/3] qemu_capabilities: add "query-stats" QMP command
 to the QEMU capabilities
In-Reply-To: <20220705232628.1779286-1-natto@weirdnatto.in>
References: <20220705232628.1779286-1-natto@weirdnatto.in>
Message-ID: <20220705232628.1779286-3-natto@weirdnatto.in>

Related: https://gitlab.com/libvirt/libvirt/-/issues/276

This patch adds "query-stats" to the QEMU capabilities.

Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
---
 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 2c3be3ec..81fc597a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
+              "query-stats", /* QEMU_CAPS_QUERY_STATS */
     );
 
 
@@ -1225,6 +1226,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
     { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
     { "calc-dirty-rate", QEMU_CAPS_CALC_DIRTY_RATE },
+    { "query-stats", QEMU_CAPS_QUERY_STATS },
 };
 
 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6f35ba14..29e55b3a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
+    QEMU_CAPS_QUERY_STATS,  /*accepts query-stats */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
-- 
2.36.1


From natto at weirdnatto.in  Tue Jul  5 23:26:28 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Wed,  6 Jul 2022 04:56:28 +0530
Subject: [PATCH RFC v2 3/3] qemu_driver: use qemuMonitorQueryStats to extract
 halt poll time
In-Reply-To: <20220705232628.1779286-1-natto@weirdnatto.in>
References: <20220705232628.1779286-1-natto@weirdnatto.in>
Message-ID: <20220705232628.1779286-4-natto@weirdnatto.in>

Related: https://gitlab.com/libvirt/libvirt/-/issues/276

This patch uses qemuMonitorQueryStats to query "halt_poll_success_ns"
and "halt_poll_fail_ns" for every vCPU. The respective values for each
vCPU are then added together.

Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
---
 src/qemu/qemu_driver.c | 70 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 97c6ed95..30170d5c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18052,15 +18052,69 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom,
 }
 
 static int
-qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom,
-                                  virTypedParamList *params)
+qemuDomainGetStatsCpuHaltPollTime(virQEMUDriver *driver,
+                                  virDomainObj *dom,
+                                  virTypedParamList *params,
+                                  unsigned int privflags)
 {
     unsigned long long haltPollSuccess = 0;
     unsigned long long haltPollFail = 0;
-    pid_t pid = dom->pid;
+    qemuDomainObjPrivate *priv = dom->privateData;
+    bool queryStatsCap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_STATS);
 
-    if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
-        return 0;
+    if (queryStatsCap && HAVE_JOB(privflags) && virDomainObjIsActive(dom) && driver->privileged) {
+        size_t i;
+        qemuMonitorQueryStatsTargetType target = QEMU_MONITOR_QUERY_STATS_TARGET_VCPU;
+        qemuMonitorQueryStatsProvider *provider = NULL;
+        g_autoptr(GPtrArray) providers = NULL;
+        g_autoptr(GPtrArray) queried_stats = NULL;
+        provider = qemuMonitorQueryStatsProviderNew(
+            target,
+            QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
+            QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS,
+            QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS,
+            -1);
+
+        if (!provider)
+            return 0;
+
+        providers = g_ptr_array_new_full(1, (GDestroyNotify) qemuMonitorQueryStatsProviderFree);
+        g_ptr_array_add(providers, provider);
+
+        qemuDomainObjEnterMonitor(driver, dom);
+        queried_stats = qemuMonitorQueryStats(priv->mon, target, NULL, providers);
+        qemuDomainObjExitMonitor(dom);
+
+        if (!queried_stats)
+            return 0;
+
+        for (i = 0; i < queried_stats->len; i++) {
+            unsigned long long curHaltPollSuccess, curHaltPollFail;
+            GHashTable *cur_table = queried_stats->pdata[i];
+            virJSONValue *success_obj, *fail_obj;
+            const char *success_str = qemuMonitorQueryStatsVcpuNameTypeToString(
+                QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS);
+            const char *fail_str = qemuMonitorQueryStatsVcpuNameTypeToString(
+                QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS);
+
+            success_obj = g_hash_table_lookup(cur_table, success_str);
+            fail_obj = g_hash_table_lookup(cur_table, fail_str);
+
+            if (!(success_obj && fail_obj))
+                return 0;
+
+            ignore_value(virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess));
+            ignore_value(virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail));
+
+            haltPollSuccess += curHaltPollSuccess;
+            haltPollFail += curHaltPollFail;
+        }
+    } else {
+        pid_t pid = dom->pid;
+
+        if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
+            return 0;
+    }
 
     if (virTypedParamListAddULLong(params, haltPollSuccess, "cpu.haltpoll.success.time") < 0 ||
         virTypedParamListAddULLong(params, haltPollFail, "cpu.haltpoll.fail.time") < 0)
@@ -18073,7 +18127,7 @@ static int
 qemuDomainGetStatsCpu(virQEMUDriver *driver,
                       virDomainObj *dom,
                       virTypedParamList *params,
-                      unsigned int privflags G_GNUC_UNUSED)
+                      unsigned int privflags)
 {
     if (qemuDomainGetStatsCpuCgroup(dom, params) < 0)
         return -1;
@@ -18081,7 +18135,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver,
     if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0)
         return -1;
 
-    if (qemuDomainGetStatsCpuHaltPollTime(dom, params) < 0)
+    if (qemuDomainGetStatsCpuHaltPollTime(driver, dom, params, privflags) < 0)
         return -1;
 
     return 0;
@@ -18915,7 +18969,7 @@ static virQEMUCapsFlags queryDirtyRateRequired[] = {
 
 static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = {
     { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false, NULL },
-    { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false, NULL },
+    { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, true, NULL },
     { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true, NULL },
     { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true, NULL },
     { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false, NULL },
-- 
2.36.1


From hhan at redhat.com  Wed Jul  6 02:02:52 2022
From: hhan at redhat.com (Han Han)
Date: Wed,  6 Jul 2022 10:02:52 +0800
Subject: [PATCH] virt-xml-validate: Fix incorrect wildcards for XML roots
Message-ID: <20220706020252.887907-1-hhan@redhat.com>

To match the XML roots domainCapabilities and storagepoolCapabilities,
the wildcards should be *domainCap* and *storagepoolCap*.

Fixes: 7b0e2e4a55
Signed-off-by: Han Han <hhan at redhat.com>
---
 tools/virt-xml-validate.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in
index e444ef2fbc..2d5ba510ab 100644
--- a/tools/virt-xml-validate.in
+++ b/tools/virt-xml-validate.in
@@ -86,7 +86,7 @@ if [ -z "$TYPE" ]; then
      *domainbackup*)
         TYPE="domainbackup"
         ;;
-     *domaincaps*)
+     *domainCap*)
         TYPE="domaincaps"
         ;;
      *domain*)
@@ -98,7 +98,7 @@ if [ -z "$TYPE" ]; then
      *network*)
         TYPE="network"
         ;;
-     *storagepoolcaps*)
+     *storagepoolCap*)
         TYPE="storagepoolcaps"
         ;;
      *pool*)
-- 
2.36.1


From hhan at redhat.com  Wed Jul  6 02:42:02 2022
From: hhan at redhat.com (Han Han)
Date: Wed,  6 Jul 2022 10:42:02 +0800
Subject: [PATCH] schemas: rng: Make secret optional in storage vol
Message-ID: <20220706024202.895610-1-hhan@redhat.com>

For a qcow2 storage volume with luks encryption created by qemu-img, its
dumped storage vol XML has no secret element in encryption:
<volume type='file'>
    ...
    <encryption format='luks'>
    </encryption>
    ...
</volume>

That will cause a failure in rng validation. Fix that validation failure.

Signed-off-by: Han Han <hhan at redhat.com>
---
 src/conf/schemas/storagecommon.rng | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/conf/schemas/storagecommon.rng b/src/conf/schemas/storagecommon.rng
index 10f1bc6a15..76714c9aad 100644
--- a/src/conf/schemas/storagecommon.rng
+++ b/src/conf/schemas/storagecommon.rng
@@ -24,17 +24,19 @@
           </choice>
         </attribute>
       </optional>
-      <interleave>
-        <ref name="secret"/>
-        <optional>
-          <element name="cipher">
-            <ref name="keycipher"/>
-          </element>
-          <element name="ivgen">
-            <ref name="keyivgen"/>
-          </element>
-        </optional>
-      </interleave>
+      <optional>
+        <interleave>
+          <ref name="secret"/>
+          <optional>
+            <element name="cipher">
+              <ref name="keycipher"/>
+            </element>
+            <element name="ivgen">
+              <ref name="keyivgen"/>
+            </element>
+          </optional>
+        </interleave>
+      </optional>
     </element>
   </define>
 
-- 
2.36.1


From hhan at redhat.com  Wed Jul  6 06:20:30 2022
From: hhan at redhat.com (Han Han)
Date: Wed,  6 Jul 2022 14:20:30 +0800
Subject: [PATCH] docs: Fix syntax error for defaultiothread
Message-ID: <20220706062030.927472-1-hhan@redhat.com>

Signed-off-by: Han Han <hhan at redhat.com>
---
 docs/formatdomain.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index a4e3c39928..89b627f4bd 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -715,7 +715,7 @@ host/guest with many LUNs. :since:`Since 1.2.8 (QEMU only)`
        <iothread id="6"/>
        <iothread id="8" thread_pool_min="2" thread_pool_max="32"/>
      </iothreadids>
-     <defaultiothread thread_pool_min="8" thread_pool_max="16">
+     <defaultiothread thread_pool_min="8" thread_pool_max="16"/>
      ...
    </domain>
 
-- 
2.36.1


From mprivozn at redhat.com  Thu Jul  7 10:07:06 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu,  7 Jul 2022 12:07:06 +0200
Subject: [PATCH 0/3] conf: Separate domain post parse code into
 domain_postparse.c
Message-ID: <cover.1657188411.git.mprivozn@redhat.com>

*** BLURB HERE ***

Michal Pr?vozn?k (3):
  domain_conf: Unexport virDomainDefPostParseDeviceIteratorData
  conf: Separate domain post parse code into domain_postparse.c
  domain_postparse: Move error messages onto single line

 po/POTFILES                 |    1 +
 src/conf/domain_conf.c      | 1446 +---------------------------------
 src/conf/domain_conf.h      |   10 -
 src/conf/domain_postparse.c | 1466 +++++++++++++++++++++++++++++++++++
 src/conf/domain_postparse.h |   37 +
 src/conf/domain_validate.c  |   11 +-
 src/conf/meson.build        |    1 +
 src/libvirt_private.syms    |    5 +-
 src/libxl/xen_xl.c          |    1 +
 src/libxl/xen_xm.c          |    1 +
 src/lxc/lxc_native.c        |    1 +
 src/qemu/qemu_driver.c      |    1 +
 src/qemu/qemu_process.c     |    1 +
 src/vmx/vmx.c               |    1 +
 14 files changed, 1525 insertions(+), 1458 deletions(-)
 create mode 100644 src/conf/domain_postparse.c
 create mode 100644 src/conf/domain_postparse.h

-- 
2.35.1


From mprivozn at redhat.com  Thu Jul  7 10:07:08 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu,  7 Jul 2022 12:07:08 +0200
Subject: [PATCH 2/3] conf: Separate domain post parse code into
 domain_postparse.c
In-Reply-To: <cover.1657188411.git.mprivozn@redhat.com>
References: <cover.1657188411.git.mprivozn@redhat.com>
Message-ID: <72a26953df0ac1b7189864a9bfe14267b94cda54.1657188411.git.mprivozn@redhat.com>

The domain post parse functions currently live in domain_conf.c
which thus grows always larger. Mimic what we've done for the
validation code and move the post parse code into a separate
file: domain_postparse.c.

I've started by moving every function with PostParse in its name
into the new file and then compile hunting for helper functions
only to move them as well.

In the end, I've moved virDomainDefPostParse symbol in
libvirt_private.syms into a new section. And while
virDomainDeviceDefPostParseOne() is made 'public' in
domain_postparse.h too, I'm not exporting it because it has no
caller outside src/conf/ and it's unlikely it ever will.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 po/POTFILES                 |    1 +
 src/conf/domain_conf.c      | 1453 +---------------------------------
 src/conf/domain_conf.h      |    4 -
 src/conf/domain_postparse.c | 1483 +++++++++++++++++++++++++++++++++++
 src/conf/domain_postparse.h |   37 +
 src/conf/meson.build        |    1 +
 src/libvirt_private.syms    |    5 +-
 src/libxl/xen_xl.c          |    1 +
 src/libxl/xen_xm.c          |    1 +
 src/lxc/lxc_native.c        |    1 +
 src/qemu/qemu_driver.c      |    1 +
 src/qemu/qemu_process.c     |    1 +
 src/vmx/vmx.c               |    1 +
 13 files changed, 1533 insertions(+), 1457 deletions(-)
 create mode 100644 src/conf/domain_postparse.c
 create mode 100644 src/conf/domain_postparse.h

diff --git a/po/POTFILES b/po/POTFILES
index faaba53c8f..9621efb0d3 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -32,6 +32,7 @@ src/conf/domain_addr.c
 src/conf/domain_capabilities.c
 src/conf/domain_conf.c
 src/conf/domain_event.c
+src/conf/domain_postparse.c
 src/conf/domain_validate.c
 src/conf/interface_conf.c
 src/conf/netdev_bandwidth_conf.c
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c67fcd337d..b639022396 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -33,6 +33,7 @@
 #include "datatypes.h"
 #include "domain_addr.h"
 #include "domain_conf.h"
+#include "domain_postparse.h"
 #include "domain_validate.h"
 #include "viralloc.h"
 #include "virxml.h"
@@ -1796,49 +1797,6 @@ virDomainBlkioDeviceParseXML(xmlNodePtr root,
 }
 
 
-/**
- * virDomainDefCheckUnsupportedMemoryHotplug:
- * @def: domain definition
- *
- * Returns -1 if the domain definition would enable memory hotplug via the
- * <maxMemory> tunable and reports an error. Otherwise returns 0.
- */
-static int
-virDomainDefCheckUnsupportedMemoryHotplug(virDomainDef *def)
-{
-    /* memory hotplug tunables are not supported by this driver */
-    if (virDomainDefHasMemoryHotplug(def)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("memory hotplug tunables <maxMemory> are not "
-                         "supported by this hypervisor driver"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-/**
- * virDomainDeviceDefCheckUnsupportedMemoryDevice:
- * @dev: device definition
- *
- * Returns -1 if the device definition describes a memory device and reports an
- * error. Otherwise returns 0.
- */
-static int
-virDomainDeviceDefCheckUnsupportedMemoryDevice(virDomainDeviceDef *dev)
-{
-    /* This driver doesn't yet know how to handle memory devices */
-    if (dev->type == VIR_DOMAIN_DEVICE_MEMORY) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("memory devices are not supported by this driver"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
 bool virDomainObjTaint(virDomainObj *obj,
                        virDomainTaintFlags taint)
 {
@@ -4733,204 +4691,6 @@ virDomainDefHasDeviceAddress(virDomainDef *def,
 }
 
 
-static int
-virDomainDefRejectDuplicateControllers(virDomainDef *def)
-{
-    int max_idx[VIR_DOMAIN_CONTROLLER_TYPE_LAST];
-    virBitmap *bitmaps[VIR_DOMAIN_CONTROLLER_TYPE_LAST] = { NULL };
-    virDomainControllerDef *cont;
-    size_t nbitmaps = 0;
-    int ret = -1;
-    size_t i;
-
-    memset(max_idx, -1, sizeof(max_idx));
-
-    for (i = 0; i < def->ncontrollers; i++) {
-        cont = def->controllers[i];
-        if (cont->idx > max_idx[cont->type])
-            max_idx[cont->type] = cont->idx;
-    }
-
-    /* multiple USB controllers with the same index are allowed */
-    max_idx[VIR_DOMAIN_CONTROLLER_TYPE_USB] = -1;
-
-    for (i = 0; i < VIR_DOMAIN_CONTROLLER_TYPE_LAST; i++) {
-        if (max_idx[i] >= 0)
-            bitmaps[i] = virBitmapNew(max_idx[i] + 1);
-        nbitmaps++;
-    }
-
-    for (i = 0; i < def->ncontrollers; i++) {
-        cont = def->controllers[i];
-
-        if (max_idx[cont->type] == -1)
-            continue;
-
-        if (virBitmapIsBitSet(bitmaps[cont->type], cont->idx)) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("Multiple '%s' controllers with index '%d'"),
-                           virDomainControllerTypeToString(cont->type),
-                           cont->idx);
-            goto cleanup;
-        }
-        ignore_value(virBitmapSetBit(bitmaps[cont->type], cont->idx));
-    }
-
-    ret = 0;
- cleanup:
-    for (i = 0; i < nbitmaps; i++)
-        virBitmapFree(bitmaps[i]);
-    return ret;
-}
-
-static int
-virDomainDefRejectDuplicatePanics(virDomainDef *def)
-{
-    bool exists[VIR_DOMAIN_PANIC_MODEL_LAST];
-    size_t i;
-
-    for (i = 0; i < VIR_DOMAIN_PANIC_MODEL_LAST; i++)
-         exists[i] = false;
-
-    for (i = 0; i < def->npanics; i++) {
-        virDomainPanicModel model = def->panics[i]->model;
-        if (exists[model]) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("Multiple panic devices with model '%s'"),
-                           virDomainPanicModelTypeToString(model));
-            return -1;
-        }
-        exists[model] = true;
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainDefPostParseMemory(virDomainDef *def,
-                            unsigned int parseFlags)
-{
-    size_t i;
-    unsigned long long numaMemory = 0;
-    unsigned long long hotplugMemory = 0;
-
-    /* Attempt to infer the initial memory size from the sum NUMA memory sizes
-     * in case ABI updates are allowed or the <memory> element wasn't specified */
-    if (def->mem.total_memory == 0 ||
-        parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE ||
-        parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION)
-        numaMemory = virDomainNumaGetMemorySize(def->numa);
-
-    /* calculate the sizes of hotplug memory */
-    for (i = 0; i < def->nmems; i++)
-        hotplugMemory += def->mems[i]->size;
-
-    if (numaMemory) {
-        /* update the sizes in XML if nothing was set in the XML or ABI update
-         * is supported */
-        virDomainDefSetMemoryTotal(def, numaMemory + hotplugMemory);
-    } else {
-        /* verify that the sum of memory modules doesn't exceed the total
-         * memory. This is necessary for virDomainDefGetMemoryInitial to work
-         * properly. */
-        if (hotplugMemory > def->mem.total_memory) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("Total size of memory devices exceeds the total "
-                             "memory size"));
-            return -1;
-        }
-    }
-
-    if (virDomainDefGetMemoryInitial(def) == 0) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("Memory size must be specified via <memory> or in the "
-                         "<numa> configuration"));
-        return -1;
-    }
-
-    if (def->mem.cur_balloon > virDomainDefGetMemoryTotal(def) ||
-        def->mem.cur_balloon == 0)
-        def->mem.cur_balloon = virDomainDefGetMemoryTotal(def);
-
-    if ((def->mem.max_memory || def->mem.memory_slots) &&
-        !(def->mem.max_memory && def->mem.memory_slots)) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("both maximum memory size and "
-                         "memory slot count must be specified"));
-        return -1;
-    }
-
-    if (def->mem.max_memory &&
-        def->mem.max_memory < virDomainDefGetMemoryTotal(def)) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("maximum memory size must be equal or greater than "
-                         "the actual memory size"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainDefPostParseOs(virDomainDef *def)
-{
-    if (def->os.firmwareFeatures &&
-        def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_ENROLLED_KEYS] == VIR_TRISTATE_BOOL_YES) {
-
-        if (def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] == VIR_TRISTATE_BOOL_NO) {
-            virReportError(VIR_ERR_XML_DETAIL, "%s",
-                           _("firmware feature 'enrolled-keys' cannot be enabled when "
-                             "firmware feature 'secure-boot' is disabled"));
-            return -1;
-        }
-
-        /* For all non-broken firmware builds, enrolled-keys implies
-         * secure-boot, and having the Secure Boot keys in the NVRAM file
-         * when the firmware doesn't support the Secure Boot feature doesn't
-         * make sense anyway. Reflect this fact explicitly in the XML */
-        def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] = VIR_TRISTATE_BOOL_YES;
-    }
-
-    if (!def->os.loader)
-        return 0;
-
-    if (def->os.loader->path &&
-        def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_NONE) {
-        /* By default, loader is type of 'rom' */
-        def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_ROM;
-    }
-
-    return 0;
-}
-
-
-static void
-virDomainDefPostParseMemtune(virDomainDef *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) {
-                g_clear_pointer(&def->mem.hugepages[i].nodemask,
-                                virBitmapFree);
-            }
-        }
-    }
-}
-
-
 static int
 virDomainDefAddConsoleCompat(virDomainDef *def)
 {
@@ -5046,96 +4806,6 @@ virDomainDefAddConsoleCompat(virDomainDef *def)
 }
 
 
-static int
-virDomainDefPostParseTimer(virDomainDef *def)
-{
-    size_t i;
-
-    /* verify settings of guest timers */
-    for (i = 0; i < def->clock.ntimers; i++) {
-        virDomainTimerDef *timer = def->clock.timers[i];
-
-        if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK ||
-            timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK) {
-            if (timer->tickpolicy) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer tickpolicy"),
-                               virDomainTimerNameTypeToString(timer->name));
-                return -1;
-            }
-        }
-
-        if (timer->tickpolicy != VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP &&
-            (timer->catchup.threshold != 0 ||
-             timer->catchup.limit != 0 ||
-             timer->catchup.slew != 0)) {
-            virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("setting of timer catchup policies is only "
-                             "supported with tickpolicy='catchup'"));
-            return -1;
-        }
-
-        if (timer->name != VIR_DOMAIN_TIMER_NAME_TSC) {
-            if (timer->frequency != 0) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer frequency"),
-                               virDomainTimerNameTypeToString(timer->name));
-                return -1;
-             }
-
-            if (timer->mode) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer mode"),
-                               virDomainTimerNameTypeToString(timer->name));
-                return -1;
-             }
-        }
-
-        if (timer->name != VIR_DOMAIN_TIMER_NAME_PLATFORM &&
-            timer->name != VIR_DOMAIN_TIMER_NAME_RTC) {
-            if (timer->track != VIR_DOMAIN_TIMER_TRACK_NONE) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer track"),
-                               virDomainTimerNameTypeToString(timer->name));
-                return -1;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-static void
-virDomainDefPostParseGraphics(virDomainDef *def)
-{
-    size_t i;
-
-    for (i = 0; i < def->ngraphics; i++) {
-        virDomainGraphicsDef *graphics = def->graphics[i];
-
-        /* If spice graphics is configured without ports and with autoport='no'
-         * then we start qemu with Spice to not listen anywhere.  Let's convert
-         * this configuration to the new listen type='none' which does the
-         * same. */
-        if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
-            virDomainGraphicsListenDef *glisten = &graphics->listens[0];
-
-            if (glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS &&
-                graphics->data.spice.port == 0 &&
-                graphics->data.spice.tlsPort == 0 &&
-                !graphics->data.spice.autoport) {
-                VIR_FREE(glisten->address);
-                glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE;
-            }
-        }
-    }
-}
-
 
 /**
  * virDomainDriveAddressIsUsedByDisk:
@@ -5282,1127 +4952,6 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
 }
 
 
-/* Find out the next usable "unit" of a specific controller */
-static int
-virDomainControllerSCSINextUnit(const virDomainDef *def,
-                                unsigned int controller)
-{
-    size_t i;
-
-    for (i = 0; i < def->scsiBusMaxUnit; i++) {
-        /* Default to assigning addresses using bus = target = 0 */
-        const virDomainDeviceDriveAddress addr = {controller, 0, 0, i, 0};
-
-        if (!virDomainSCSIDriveAddressIsUsed(def, &addr))
-            return i;
-    }
-
-    return -1;
-}
-
-
-static void
-virDomainHostdevAssignAddress(virDomainXMLOption *xmlopt G_GNUC_UNUSED,
-                              const virDomainDef *def,
-                              virDomainHostdevDef *hostdev)
-{
-    int next_unit = 0;
-    int controller = 0;
-
-    /* NB: Do not attempt calling virDomainDefMaybeAddController to
-     * automagically add a "new" controller. Doing so will result in
-     * qemuDomainFindOrCreateSCSIDiskController "finding" the controller
-     * in the domain def list and thus not hotplugging the controller as
-     * well as the hostdev in the event that there are either no SCSI
-     * controllers defined or there was no space on an existing one.
-     *
-     * Because we cannot add a controller, then we should not walk the
-     * defined controllers list in order to find empty space. Doing
-     * so fails to return the valid next unit number for the 2nd
-     * hostdev being added to the as yet to be created controller.
-     */
-    do {
-        next_unit = virDomainControllerSCSINextUnit(def, controller);
-        if (next_unit < 0)
-            controller++;
-    } while (next_unit < 0);
-
-
-    hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
-    hostdev->info->addr.drive.controller = controller;
-    hostdev->info->addr.drive.bus = 0;
-    hostdev->info->addr.drive.target = 0;
-    hostdev->info->addr.drive.unit = next_unit;
-}
-
-
-/**
- * virDomainPostParseCheckISCSIPath
- * @srcpath: Source path read (a/k/a, IQN) either disk or hostdev
- *
- * The details of an IQN is defined by RFC 3720 and 3721, but
- * we just need to make sure there's a lun provided. If not
- * provided, then default to zero. For an ISCSI LUN that is
- * is provided by /dev/disk/by-path/... , then that path will
- * have the specific lun requested.
- */
-static void
-virDomainPostParseCheckISCSIPath(char **srcpath)
-{
-    char *path = NULL;
-
-    if (strchr(*srcpath, '/'))
-        return;
-
-    path = g_strdup_printf("%s/0", *srcpath);
-    g_free(*srcpath);
-    *srcpath = g_steal_pointer(&path);
-}
-
-
-static int
-virDomainHostdevDefPostParse(virDomainHostdevDef *dev,
-                             const virDomainDef *def,
-                             virDomainXMLOption *xmlopt)
-{
-    virDomainHostdevSubsysSCSI *scsisrc;
-    virDomainDeviceDriveAddress *addr = NULL;
-
-    if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
-        return 0;
-
-    switch (dev->source.subsys.type) {
-    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
-        scsisrc = &dev->source.subsys.u.scsi;
-        if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
-            virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi;
-            virDomainPostParseCheckISCSIPath(&iscsisrc->src->path);
-        }
-
-        if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
-            virDomainHostdevAssignAddress(xmlopt, def, dev);
-
-        /* Ensure provided address doesn't conflict with existing
-         * scsi disk drive address
-         */
-        addr = &dev->info->addr.drive;
-        if (virDomainDriveAddressIsUsedByDisk(def,
-                                              VIR_DOMAIN_DISK_BUS_SCSI,
-                                              addr)) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("SCSI host address controller='%u' "
-                             "bus='%u' target='%u' unit='%u' in "
-                             "use by a SCSI disk"),
-                           addr->controller, addr->bus,
-                           addr->target, addr->unit);
-            return -1;
-        }
-        break;
-    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: {
-        int model = dev->source.subsys.u.mdev.model;
-
-        if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
-            return 0;
-
-        if ((model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
-             dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) ||
-            (model == VIR_MDEV_MODEL_TYPE_VFIO_CCW &&
-             dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("Unsupported address type '%s' with mediated "
-                             "device model '%s'"),
-                           virDomainDeviceAddressTypeToString(dev->info->type),
-                           virMediatedDeviceModelTypeToString(model));
-            return -1;
-        }
-    }
-
-    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
-    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
-    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-        break;
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainChrIsaSerialDefPostParse(virDomainDef *def)
-{
-    size_t i;
-    size_t isa_serial_count = 0;
-    bool used_serial_port[VIR_MAX_ISA_SERIAL_PORTS] = { false };
-
-    /* Perform all the required checks. */
-    for (i = 0; i < def->nserials; i++) {
-        if (def->serials[i]->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL)
-            continue;
-
-        if (isa_serial_count++ >= VIR_MAX_ISA_SERIAL_PORTS ||
-            def->serials[i]->target.port >= VIR_MAX_ISA_SERIAL_PORTS) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Maximum supported number of ISA serial ports is '%d'"),
-                           VIR_MAX_ISA_SERIAL_PORTS);
-            return -1;
-        }
-
-        if (def->serials[i]->target.port != -1) {
-            if (used_serial_port[def->serials[i]->target.port]) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("target port '%d' already allocated"),
-                               def->serials[i]->target.port);
-                return -1;
-            }
-            used_serial_port[def->serials[i]->target.port] = true;
-        }
-    }
-
-    /* Assign the ports to the devices. */
-    for (i = 0; i < def->nserials; i++) {
-        size_t j;
-
-        if (def->serials[i]->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL ||
-            def->serials[i]->target.port != -1)
-            continue;
-
-        for (j = 0; j < VIR_MAX_ISA_SERIAL_PORTS; j++) {
-            if (!used_serial_port[j]) {
-                def->serials[i]->target.port = j;
-                used_serial_port[j] = true;
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainChrDefPostParse(virDomainChrDef *chr,
-                         const virDomainDef *def)
-{
-    const virDomainChrDef **arrPtr;
-    size_t i, cnt;
-
-    virDomainChrGetDomainPtrs(def, chr->deviceType, &arrPtr, &cnt);
-
-    if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
-        chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) {
-        chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
-    }
-
-    if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
-        chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA_DEBUG &&
-        !ARCH_IS_X86(def->os.arch)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("isa-debug serial type only valid on x86 architecture"));
-        return -1;
-    }
-
-    if (chr->target.port == -1 &&
-        (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL ||
-         chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL ||
-         chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE)) {
-        int maxport = -1;
-
-        for (i = 0; i < cnt; i++) {
-            if (arrPtr[i]->target.port > maxport)
-                maxport = arrPtr[i]->target.port;
-        }
-
-        chr->target.port = maxport + 1;
-    }
-
-    return 0;
-}
-
-
-static void
-virDomainRNGDefPostParse(virDomainRNGDef *rng)
-{
-    /* set default path for virtio-rng "random" backend to /dev/random */
-    if (rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM &&
-        !rng->source.file) {
-        rng->source.file = g_strdup("/dev/random");
-    }
-}
-
-
-static void
-virDomainDiskExpandGroupIoTune(virDomainDiskDef *disk,
-                               const virDomainDef *def)
-{
-    size_t i;
-
-    if (!disk->blkdeviotune.group_name ||
-        virDomainBlockIoTuneInfoHasAny(&disk->blkdeviotune))
-        return;
-
-    for (i = 0; i < def->ndisks; i++) {
-        virDomainDiskDef *d = def->disks[i];
-
-        if (STRNEQ_NULLABLE(disk->blkdeviotune.group_name, d->blkdeviotune.group_name) ||
-            !virDomainBlockIoTuneInfoHasAny(&d->blkdeviotune))
-            continue;
-
-
-        VIR_FREE(disk->blkdeviotune.group_name);
-        virDomainBlockIoTuneInfoCopy(&d->blkdeviotune, &disk->blkdeviotune);
-
-        return;
-    }
-}
-
-
-static int
-virDomainDiskDefPostParse(virDomainDiskDef *disk,
-                          const virDomainDef *def,
-                          virDomainXMLOption *xmlopt)
-{
-    if (disk->dst) {
-        char *newdst;
-
-        /* Work around for compat with Xen driver in previous libvirt releases */
-        if ((newdst = g_strdup(STRSKIP(disk->dst, "ioemu:")))) {
-            g_free(disk->dst);
-            disk->dst = newdst;
-        }
-    }
-
-    /* Force CDROM to be listed as read only */
-    if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
-        disk->src->readonly = true;
-
-    if (disk->bus == VIR_DOMAIN_DISK_BUS_NONE) {
-        disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
-
-        if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
-            disk->bus = VIR_DOMAIN_DISK_BUS_FDC;
-        } else if (disk->dst) {
-            if (STRPREFIX(disk->dst, "hd"))
-                disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
-            else if (STRPREFIX(disk->dst, "sd"))
-                disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
-            else if (STRPREFIX(disk->dst, "vd"))
-                disk->bus = VIR_DOMAIN_DISK_BUS_VIRTIO;
-            else if (STRPREFIX(disk->dst, "xvd"))
-                disk->bus = VIR_DOMAIN_DISK_BUS_XEN;
-            else if (STRPREFIX(disk->dst, "ubd"))
-                disk->bus = VIR_DOMAIN_DISK_BUS_UML;
-        }
-    }
-
-    if (disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT &&
-        disk->src->readonly)
-        disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
-
-    if (disk->src->type == VIR_STORAGE_TYPE_NETWORK &&
-        disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) {
-        virDomainPostParseCheckISCSIPath(&disk->src->path);
-    }
-
-    if (disk->src->type == VIR_STORAGE_TYPE_NVME) {
-        if (disk->src->nvme->managed == VIR_TRISTATE_BOOL_ABSENT)
-            disk->src->nvme->managed = VIR_TRISTATE_BOOL_YES;
-    }
-
-    /* vhost-user doesn't allow us to snapshot, disable snapshots by default */
-    if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER &&
-        disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) {
-        disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
-    }
-
-    if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
-        disk->dst &&
-        virDomainDiskDefAssignAddress(xmlopt, disk, def) < 0) {
-        return -1;
-    }
-
-    virDomainDiskExpandGroupIoTune(disk, def);
-
-    return 0;
-}
-
-
-static void
-virDomainVideoDefPostParse(virDomainVideoDef *video,
-                           const virDomainDef *def)
-{
-    /* Fill out (V)RAM if the driver-specific callback did not do so */
-    if (video->ram == 0 && video->type == VIR_DOMAIN_VIDEO_TYPE_QXL)
-        video->ram = virDomainVideoDefaultRAM(def, video->type);
-    if (video->vram == 0)
-        video->vram = virDomainVideoDefaultRAM(def, video->type);
-
-    video->ram = VIR_ROUND_UP_POWER_OF_TWO(video->ram);
-    video->vram = VIR_ROUND_UP_POWER_OF_TWO(video->vram);
-}
-
-
-static int
-virDomainControllerDefPostParse(virDomainControllerDef *cdev)
-{
-    if (cdev->iothread &&
-        cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI &&
-        cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL &&
-        cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("'iothread' attribute only supported for "
-                         "virtio scsi controllers"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-static void
-virDomainVsockDefPostParse(virDomainVsockDef *vsock)
-{
-    if (vsock->auto_cid == VIR_TRISTATE_BOOL_ABSENT) {
-        if (vsock->guest_cid != 0)
-            vsock->auto_cid = VIR_TRISTATE_BOOL_NO;
-        else
-            vsock->auto_cid = VIR_TRISTATE_BOOL_YES;
-    }
-}
-
-
-static int
-virDomainMemoryDefPostParse(virDomainMemoryDef *mem,
-                            const virDomainDef *def)
-{
-    switch (mem->model) {
-    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-        /* Virtio-pmem mandates shared access so that guest writes get
-         * reflected in the underlying file. */
-        if (mem->access == VIR_DOMAIN_MEMORY_ACCESS_DEFAULT)
-            mem->access = VIR_DOMAIN_MEMORY_ACCESS_SHARED;
-        break;
-
-    case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
-        /* If no NVDIMM UUID was provided in XML, generate one. */
-        if (ARCH_IS_PPC64(def->os.arch) &&
-            !mem->uuid) {
-
-            mem->uuid = g_new0(unsigned char, VIR_UUID_BUFLEN);
-            if (virUUIDGenerate(mem->uuid) < 0) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               "%s", _("Failed to generate UUID"));
-                return -1;
-            }
-        }
-        break;
-
-    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-    case VIR_DOMAIN_MEMORY_MODEL_DIMM:
-    case VIR_DOMAIN_MEMORY_MODEL_NONE:
-    case VIR_DOMAIN_MEMORY_MODEL_LAST:
-        break;
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainFSDefPostParse(virDomainFSDef *fs)
-{
-    if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_DEFAULT && !fs->sock)
-        fs->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH;
-
-    return 0;
-}
-
-
-static int
-virDomainDeviceDefPostParseCommon(virDomainDeviceDef *dev,
-                                  const virDomainDef *def,
-                                  unsigned int parseFlags G_GNUC_UNUSED,
-                                  virDomainXMLOption *xmlopt)
-{
-    int ret = -1;
-
-    switch ((virDomainDeviceType)dev->type) {
-    case VIR_DOMAIN_DEVICE_CHR:
-        ret = virDomainChrDefPostParse(dev->data.chr, def);
-        break;
-
-    case VIR_DOMAIN_DEVICE_RNG:
-        virDomainRNGDefPostParse(dev->data.rng);
-        ret = 0;
-        break;
-
-    case VIR_DOMAIN_DEVICE_DISK:
-        ret = virDomainDiskDefPostParse(dev->data.disk, def, xmlopt);
-        break;
-
-    case VIR_DOMAIN_DEVICE_VIDEO:
-        virDomainVideoDefPostParse(dev->data.video, def);
-        ret = 0;
-        break;
-
-    case VIR_DOMAIN_DEVICE_HOSTDEV:
-        ret = virDomainHostdevDefPostParse(dev->data.hostdev, def, xmlopt);
-        break;
-
-    case VIR_DOMAIN_DEVICE_CONTROLLER:
-        ret = virDomainControllerDefPostParse(dev->data.controller);
-        break;
-
-    case VIR_DOMAIN_DEVICE_VSOCK:
-        virDomainVsockDefPostParse(dev->data.vsock);
-        ret = 0;
-        break;
-
-    case VIR_DOMAIN_DEVICE_MEMORY:
-        ret = virDomainMemoryDefPostParse(dev->data.memory, def);
-        break;
-
-    case VIR_DOMAIN_DEVICE_FS:
-        ret = virDomainFSDefPostParse(dev->data.fs);
-        break;
-
-    case VIR_DOMAIN_DEVICE_LEASE:
-    case VIR_DOMAIN_DEVICE_NET:
-    case VIR_DOMAIN_DEVICE_INPUT:
-    case VIR_DOMAIN_DEVICE_SOUND:
-    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_SHMEM:
-    case VIR_DOMAIN_DEVICE_TPM:
-    case VIR_DOMAIN_DEVICE_PANIC:
-    case VIR_DOMAIN_DEVICE_IOMMU:
-    case VIR_DOMAIN_DEVICE_AUDIO:
-        ret = 0;
-        break;
-
-    case VIR_DOMAIN_DEVICE_NONE:
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("unexpected VIR_DOMAIN_DEVICE_NONE"));
-        break;
-
-    case VIR_DOMAIN_DEVICE_LAST:
-    default:
-        virReportEnumRangeError(virDomainDeviceType, dev->type);
-        break;
-    }
-
-    return ret;
-}
-
-
-/**
- * virDomainDefRemoveOfflineVcpuPin:
- * @def: domain definition
- *
- * This function removes vcpu pinning information from offline vcpus. This is
- * designed to be used for drivers which don't support offline vcpupin.
- */
-static void
-virDomainDefRemoveOfflineVcpuPin(virDomainDef *def)
-{
-    size_t i;
-    virDomainVcpuDef *vcpu;
-
-    for (i = 0; i < virDomainDefGetVcpusMax(def); i++) {
-        vcpu = virDomainDefGetVcpu(def, i);
-
-        if (vcpu && !vcpu->online && vcpu->cpumask) {
-            g_clear_pointer(&vcpu->cpumask, virBitmapFree);
-
-            VIR_WARN("Ignoring unsupported vcpupin for offline vcpu '%zu'", i);
-        }
-    }
-}
-
-
-static void
-virDomainAssignControllerIndexes(virDomainDef *def)
-{
-    /* the index attribute of a controller is optional in the XML, but
-     * is required to be valid at any time after parse. When no index
-     * is provided for a controller, assign one automatically by
-     * looking at what indexes are already used for that controller
-     * type in the domain - the unindexed controller gets the lowest
-     * unused index.
-     */
-    size_t outer;
-
-    for (outer = 0; outer < def->ncontrollers; outer++) {
-        virDomainControllerDef *cont = def->controllers[outer];
-        virDomainControllerDef *prev = NULL;
-        size_t inner;
-
-        if (cont->idx != -1)
-            continue;
-
-        if (outer > 0 && IS_USB2_CONTROLLER(cont)) {
-            /* USB2 controllers are the only exception to the simple
-             * "assign the lowest unused index". A group of USB2
-             * "companions" should all be at the same index as other
-             * USB2 controllers in the group, but only do this
-             * automatically if it appears to be the intent. To prove
-             * intent: the USB controller on the list just prior to
-             * this one must also be a USB2 controller, and there must
-             * not yet be a controller with the exact same model of
-             * this one and the same index as the previously added
-             * controller (e.g., if this controller is a UHCI1, then
-             * the previous controller must be an EHCI1 or a UHCI[23],
-             * and there must not already be a UHCI1 controller with
-             * the same index as the previous controller). If all of
-             * these are satisfied, set this controller to the same
-             * index as the previous controller.
-             */
-            int prevIdx;
-
-            prevIdx = outer - 1;
-            while (prevIdx >= 0 &&
-                   def->controllers[prevIdx]->type != VIR_DOMAIN_CONTROLLER_TYPE_USB)
-                prevIdx--;
-            if (prevIdx >= 0)
-                prev = def->controllers[prevIdx];
-            /* if the last USB controller isn't USB2, that breaks
-             * the chain, so we need a new index for this new
-             * controller
-             */
-            if (prev && !IS_USB2_CONTROLLER(prev))
-                prev = NULL;
-
-            /* if prev != NULL, we've found a potential index to
-             * use. Make sure this index isn't already used by an
-             * existing USB2 controller of the same model as the new
-             * one.
-             */
-            for (inner = 0; prev && inner < def->ncontrollers; inner++) {
-                if (def->controllers[inner]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
-                    def->controllers[inner]->idx == prev->idx &&
-                    def->controllers[inner]->model == cont->model) {
-                    /* we already have a controller of this model with
-                     * the proposed index, so we need to move to a new
-                     * index for this controller
-                     */
-                    prev = NULL;
-                }
-            }
-            if (prev)
-                cont->idx = prev->idx;
-        }
-        /* if none of the above applied, prev will be NULL */
-        if (!prev)
-            cont->idx = virDomainControllerFindUnusedIndex(def, cont->type);
-    }
-}
-
-
-#define UNSUPPORTED(FEATURE) (!((FEATURE) & xmlopt->config.features))
-/**
- * virDomainDefPostParseCheckFeatures:
- * @def: domain definition
- * @xmlopt: XML parser option object
- *
- * This function checks that the domain configuration is supported according to
- * the supported features for a given hypervisor. See virDomainDefFeatures and
- * virDomainDefParserConfig.
- *
- * Returns 0 on success and -1 on error with an appropriate libvirt error.
- */
-static int
-virDomainDefPostParseCheckFeatures(virDomainDef *def,
-                                   virDomainXMLOption *xmlopt)
-{
-    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG) &&
-        virDomainDefCheckUnsupportedMemoryHotplug(def) < 0)
-        return -1;
-
-    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN))
-        virDomainDefRemoveOfflineVcpuPin(def);
-
-    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NAME_SLASH)) {
-        if (def->name && strchr(def->name, '/')) {
-            virReportError(VIR_ERR_XML_ERROR,
-                           _("name %s cannot contain '/'"), def->name);
-            return -1;
-        }
-    }
-
-    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS) &&
-        def->individualvcpus) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("individual CPU state configuration is not supported"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-/**
- * virDomainDeviceDefPostParseCheckFeatures:
- * @dev: device definition
- * @xmlopt: XML parser option object
- *
- * This function checks that the device configuration is supported according to
- * the supported features for a given hypervisor. See virDomainDefFeatures and
- * virDomainDefParserConfig.
- *
- * Returns 0 on success and -1 on error with an appropriate libvirt error.
- */
-static int
-virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDef *dev,
-                                         virDomainXMLOption *xmlopt)
-{
-    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG) &&
-        virDomainDeviceDefCheckUnsupportedMemoryDevice(dev) < 0)
-        return -1;
-
-    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING) &&
-        dev->type == VIR_DOMAIN_DEVICE_NET &&
-        dev->data.net->modelstr) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("driver does not support net model '%s'"),
-                       dev->data.net->modelstr);
-        return -1;
-    }
-
-    return 0;
-}
-#undef UNSUPPORTED
-
-
-static int
-virDomainDeviceDefPostParse(virDomainDeviceDef *dev,
-                            const virDomainDef *def,
-                            unsigned int flags,
-                            virDomainXMLOption *xmlopt,
-                            void *parseOpaque)
-{
-    int ret;
-
-    if (xmlopt->config.devicesPostParseCallback) {
-        ret = xmlopt->config.devicesPostParseCallback(dev, def, flags,
-                                                      xmlopt->config.priv,
-                                                      parseOpaque);
-        if (ret < 0)
-            return ret;
-    }
-
-    if ((ret = virDomainDeviceDefPostParseCommon(dev, def, flags, xmlopt)) < 0)
-        return ret;
-
-    if (virDomainDeviceDefPostParseCheckFeatures(dev, xmlopt) < 0)
-        return -1;
-
-    return 0;
-}
-
-static int
-virDomainDeviceDefPostParseOne(virDomainDeviceDef *dev,
-                               const virDomainDef *def,
-                               unsigned int flags,
-                               virDomainXMLOption *xmlopt,
-                               void *parseOpaque)
-{
-    void *data = NULL;
-    int ret;
-
-    if (!parseOpaque && xmlopt->config.domainPostParseDataAlloc) {
-        if (xmlopt->config.domainPostParseDataAlloc(def, flags,
-                                                    xmlopt->config.priv,
-                                                    &data) < 0)
-            return -1;
-        parseOpaque = data;
-    }
-
-    ret = virDomainDeviceDefPostParse(dev, def, flags, xmlopt, parseOpaque);
-
-    if (data && xmlopt->config.domainPostParseDataFree)
-        xmlopt->config.domainPostParseDataFree(data);
-
-    return ret;
-}
-
-
-struct virDomainDefPostParseDeviceIteratorData {
-    virDomainXMLOption *xmlopt;
-    void *parseOpaque;
-    unsigned int parseFlags;
-};
-
-
-static int
-virDomainDefPostParseDeviceIterator(virDomainDef *def,
-                                    virDomainDeviceDef *dev,
-                                    virDomainDeviceInfo *info G_GNUC_UNUSED,
-                                    void *opaque)
-{
-    struct virDomainDefPostParseDeviceIteratorData *data = opaque;
-    return virDomainDeviceDefPostParse(dev, def,
-                                       data->parseFlags, data->xmlopt,
-                                       data->parseOpaque);
-}
-
-
-static int
-virDomainVcpuDefPostParse(virDomainDef *def)
-{
-    virDomainVcpuDef *vcpu;
-    size_t maxvcpus = virDomainDefGetVcpusMax(def);
-    size_t i;
-
-    for (i = 0; i < maxvcpus; i++) {
-        vcpu = virDomainDefGetVcpu(def, i);
-
-        /* impossible but some compilers don't like it */
-        if (!vcpu)
-            continue;
-
-        switch (vcpu->hotpluggable) {
-        case VIR_TRISTATE_BOOL_ABSENT:
-            if (vcpu->online)
-                vcpu->hotpluggable = VIR_TRISTATE_BOOL_NO;
-            else
-                vcpu->hotpluggable = VIR_TRISTATE_BOOL_YES;
-            break;
-
-        case VIR_TRISTATE_BOOL_NO:
-            if (!vcpu->online) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("vcpu '%zu' is both offline and not "
-                                 "hotpluggable"), i);
-                return -1;
-            }
-            break;
-
-        case VIR_TRISTATE_BOOL_YES:
-        case VIR_TRISTATE_BOOL_LAST:
-            break;
-        }
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainDefPostParseCPU(virDomainDef *def)
-{
-    if (!def->cpu)
-        return 0;
-
-    if (def->cpu->mode == VIR_CPU_MODE_CUSTOM &&
-        !def->cpu->model &&
-        def->cpu->check != VIR_CPU_CHECK_DEFAULT) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("check attribute specified for CPU with no model"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainDefCollectBootOrder(virDomainDef *def G_GNUC_UNUSED,
-                             virDomainDeviceDef *dev G_GNUC_UNUSED,
-                             virDomainDeviceInfo *info,
-                             void *data)
-{
-    GHashTable *bootHash = data;
-    g_autofree char *order = NULL;
-
-    if (info->bootIndex == 0)
-        return 0;
-
-    if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
-        dev->data.hostdev->parentnet) {
-        /* 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;
-    }
-    order = g_strdup_printf("%u", info->bootIndex);
-
-    if (virHashLookup(bootHash, order)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("boot order '%s' used for more than one device"),
-                       order);
-        return -1;
-    }
-
-    if (virHashAddEntry(bootHash, order, (void *) 1) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-static int
-virDomainDefBootOrderPostParse(virDomainDef *def)
-{
-    g_autoptr(GHashTable) bootHash = virHashNew(NULL);
-
-    if (virDomainDeviceInfoIterate(def, virDomainDefCollectBootOrder, bootHash) < 0)
-        return -1;
-
-    if (def->os.nBootDevs > 0 && virHashSize(bootHash) > 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("per-device boot elements cannot be used"
-                         " together with os/boot elements"));
-        return -1;
-    }
-
-    if (def->os.nBootDevs == 0 && virHashSize(bootHash) == 0) {
-        def->os.nBootDevs = 1;
-        def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK;
-    }
-
-    return 0;
-}
-
-
-static int
-virDomainDefPostParseVideo(virDomainDef *def,
-                           void *opaque)
-{
-    if (def->nvideos == 0)
-        return 0;
-
-    if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) {
-        char *alias;
-
-        /* we don't want to format any values we automatically fill in for
-         * videos into the XML, so clear them, but retain any user-assigned
-         * alias */
-        alias = g_steal_pointer(&def->videos[0]->info.alias);
-        virDomainVideoDefClear(def->videos[0]);
-        def->videos[0]->type = VIR_DOMAIN_VIDEO_TYPE_NONE;
-        def->videos[0]->info.alias = g_steal_pointer(&alias);
-    } 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;
-
-        /* 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(virDomainDef *def,
-                            struct virDomainDefPostParseDeviceIteratorData *data,
-                            virDomainXMLOption *xmlopt)
-{
-    size_t i;
-
-    /* verify init path for container based domains */
-    if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("init binary must be specified"));
-        return -1;
-    }
-
-    if (virDomainVcpuDefPostParse(def) < 0)
-        return -1;
-
-    if (virDomainDefPostParseMemory(def, data->parseFlags) < 0)
-        return -1;
-
-    if (virDomainDefPostParseOs(def) < 0)
-        return -1;
-
-    virDomainDefPostParseMemtune(def);
-
-    if (virDomainDefRejectDuplicateControllers(def) < 0)
-        return -1;
-
-    if (virDomainDefRejectDuplicatePanics(def) < 0)
-        return -1;
-
-    if (def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
-        !(data->xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_NO_BOOT_ORDER) &&
-        virDomainDefBootOrderPostParse(def) < 0)
-        return -1;
-
-    if (virDomainDefPostParseTimer(def) < 0)
-        return -1;
-
-    if (virDomainDefAddImplicitDevices(def, xmlopt) < 0)
-        return -1;
-
-    if (virDomainDefPostParseVideo(def, data) < 0)
-        return -1;
-
-    if (def->nserials != 0) {
-        virDomainDeviceDef device = {
-            .type = VIR_DOMAIN_DEVICE_CHR,
-            .data.chr = def->serials[0],
-        };
-
-        /* serials[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;
-    }
-
-    /* Implicit SCSI controllers without a defined model might have
-     * been added in AddImplicitDevices, after we've done the per-device
-     * post-parse. */
-    for (i = 0; i < def->ncontrollers; i++) {
-        if (def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT &&
-            def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
-            virDomainDeviceDef device = {
-                .type = VIR_DOMAIN_DEVICE_CONTROLLER,
-                .data.controller = def->controllers[i],
-            };
-            if (virDomainDefPostParseDeviceIterator(def, &device, NULL, data) < 0)
-                return -1;
-        }
-    }
-
-    /* clean up possibly duplicated metadata entries */
-    virXMLNodeSanitizeNamespaces(def->metadata);
-
-    virDomainDefPostParseGraphics(def);
-
-    if (virDomainDefPostParseCPU(def) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-static int
-virDomainDefPostParseCheckFailure(virDomainDef *def,
-                                  unsigned int parseFlags,
-                                  int ret)
-{
-    if (ret != 0)
-        def->postParseFailed = true;
-
-    if (ret <= 0)
-        return ret;
-
-    if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARSE_FAIL))
-        return -1;
-
-    virResetLastError();
-    return 0;
-}
-
-
-int
-virDomainDefPostParse(virDomainDef *def,
-                      unsigned int parseFlags,
-                      virDomainXMLOption *xmlopt,
-                      void *parseOpaque)
-{
-    int ret = -1;
-    bool localParseOpaque = false;
-    struct virDomainDefPostParseDeviceIteratorData data = {
-        .xmlopt = xmlopt,
-        .parseFlags = parseFlags,
-        .parseOpaque = parseOpaque,
-    };
-
-    def->postParseFailed = false;
-
-    /* call the basic post parse callback */
-    if (xmlopt->config.domainPostParseBasicCallback) {
-        ret = xmlopt->config.domainPostParseBasicCallback(def,
-                                                          xmlopt->config.priv);
-
-        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
-            goto cleanup;
-    }
-
-    if (!data.parseOpaque &&
-        xmlopt->config.domainPostParseDataAlloc) {
-        ret = xmlopt->config.domainPostParseDataAlloc(def, parseFlags,
-                                                      xmlopt->config.priv,
-                                                      &data.parseOpaque);
-
-        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
-            goto cleanup;
-        localParseOpaque = true;
-    }
-
-    /* this must be done before the hypervisor-specific callback,
-     * in case presence of a controller at a specific index is checked
-     */
-    virDomainAssignControllerIndexes(def);
-
-    /* call the domain config callback */
-    if (xmlopt->config.domainPostParseCallback) {
-        ret = xmlopt->config.domainPostParseCallback(def, parseFlags,
-                                                     xmlopt->config.priv,
-                                                     data.parseOpaque);
-        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
-            goto cleanup;
-    }
-
-    if (virDomainChrIsaSerialDefPostParse(def) < 0)
-            return -1;
-
-    /* iterate the devices */
-    ret = virDomainDeviceInfoIterateFlags(def,
-                                          virDomainDefPostParseDeviceIterator,
-                                          DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
-                                          DOMAIN_DEVICE_ITERATE_MISSING_INFO,
-                                          &data);
-
-    if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
-        goto cleanup;
-
-    if ((ret = virDomainDefPostParseCommon(def, &data, xmlopt)) < 0)
-        goto cleanup;
-
-    if (xmlopt->config.assignAddressesCallback) {
-        ret = xmlopt->config.assignAddressesCallback(def, parseFlags,
-                                                     xmlopt->config.priv,
-                                                     data.parseOpaque);
-        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
-            goto cleanup;
-    }
-
-    if ((ret = virDomainDefPostParseCheckFeatures(def, xmlopt)) < 0)
-        goto cleanup;
-
-    ret = 0;
-
- cleanup:
-    if (localParseOpaque && xmlopt->config.domainPostParseDataFree)
-        xmlopt->config.domainPostParseDataFree(data.parseOpaque);
-
-    if (ret == 1)
-        ret = -1;
-
-    return ret;
-}
-
-
 bool
 virDomainDefHasUSB(const virDomainDef *def)
 {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 543b343be9..c56b84683c 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3306,10 +3306,6 @@ bool
 virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
                                 const virDomainDeviceDriveAddress *addr);
 
-int virDomainDefPostParse(virDomainDef *def,
-                          unsigned int parseFlags,
-                          virDomainXMLOption *xmlopt,
-                          void *parseOpaque);
 bool virDomainDefHasUSB(const virDomainDef *def);
 
 bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
new file mode 100644
index 0000000000..18f06dcca8
--- /dev/null
+++ b/src/conf/domain_postparse.c
@@ -0,0 +1,1483 @@
+/*
+ * domain_postparse.c: domain post parsing helpers
+ *
+ * Copyright (C) 2022 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 "domain_postparse.h"
+#include "viralloc.h"
+#include "virlog.h"
+
+#define VIR_FROM_THIS VIR_FROM_DOMAIN
+
+VIR_LOG_INIT("conf.domain_postparse");
+
+static int
+virDomainDefPostParseMemory(virDomainDef *def,
+                            unsigned int parseFlags)
+{
+    size_t i;
+    unsigned long long numaMemory = 0;
+    unsigned long long hotplugMemory = 0;
+
+    /* Attempt to infer the initial memory size from the sum NUMA memory sizes
+     * in case ABI updates are allowed or the <memory> element wasn't specified */
+    if (def->mem.total_memory == 0 ||
+        parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE ||
+        parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION)
+        numaMemory = virDomainNumaGetMemorySize(def->numa);
+
+    /* calculate the sizes of hotplug memory */
+    for (i = 0; i < def->nmems; i++)
+        hotplugMemory += def->mems[i]->size;
+
+    if (numaMemory) {
+        /* update the sizes in XML if nothing was set in the XML or ABI update
+         * is supported */
+        virDomainDefSetMemoryTotal(def, numaMemory + hotplugMemory);
+    } else {
+        /* verify that the sum of memory modules doesn't exceed the total
+         * memory. This is necessary for virDomainDefGetMemoryInitial to work
+         * properly. */
+        if (hotplugMemory > def->mem.total_memory) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("Total size of memory devices exceeds the total "
+                             "memory size"));
+            return -1;
+        }
+    }
+
+    if (virDomainDefGetMemoryInitial(def) == 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("Memory size must be specified via <memory> or in the "
+                         "<numa> configuration"));
+        return -1;
+    }
+
+    if (def->mem.cur_balloon > virDomainDefGetMemoryTotal(def) ||
+        def->mem.cur_balloon == 0)
+        def->mem.cur_balloon = virDomainDefGetMemoryTotal(def);
+
+    if ((def->mem.max_memory || def->mem.memory_slots) &&
+        !(def->mem.max_memory && def->mem.memory_slots)) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("both maximum memory size and "
+                         "memory slot count must be specified"));
+        return -1;
+    }
+
+    if (def->mem.max_memory &&
+        def->mem.max_memory < virDomainDefGetMemoryTotal(def)) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("maximum memory size must be equal or greater than "
+                         "the actual memory size"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainDefPostParseOs(virDomainDef *def)
+{
+    if (def->os.firmwareFeatures &&
+        def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_ENROLLED_KEYS] == VIR_TRISTATE_BOOL_YES) {
+
+        if (def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] == VIR_TRISTATE_BOOL_NO) {
+            virReportError(VIR_ERR_XML_DETAIL, "%s",
+                           _("firmware feature 'enrolled-keys' cannot be enabled when "
+                             "firmware feature 'secure-boot' is disabled"));
+            return -1;
+        }
+
+        /* For all non-broken firmware builds, enrolled-keys implies
+         * secure-boot, and having the Secure Boot keys in the NVRAM file
+         * when the firmware doesn't support the Secure Boot feature doesn't
+         * make sense anyway. Reflect this fact explicitly in the XML */
+        def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] = VIR_TRISTATE_BOOL_YES;
+    }
+
+    if (!def->os.loader)
+        return 0;
+
+    if (def->os.loader->path &&
+        def->os.loader->type == VIR_DOMAIN_LOADER_TYPE_NONE) {
+        /* By default, loader is type of 'rom' */
+        def->os.loader->type = VIR_DOMAIN_LOADER_TYPE_ROM;
+    }
+
+    return 0;
+}
+
+
+static void
+virDomainDefPostParseMemtune(virDomainDef *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) {
+                g_clear_pointer(&def->mem.hugepages[i].nodemask,
+                                virBitmapFree);
+            }
+        }
+    }
+}
+
+
+static int
+virDomainDefPostParseTimer(virDomainDef *def)
+{
+    size_t i;
+
+    /* verify settings of guest timers */
+    for (i = 0; i < def->clock.ntimers; i++) {
+        virDomainTimerDef *timer = def->clock.timers[i];
+
+        if (timer->name == VIR_DOMAIN_TIMER_NAME_KVMCLOCK ||
+            timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK) {
+            if (timer->tickpolicy) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("timer %s doesn't support setting of "
+                                 "timer tickpolicy"),
+                               virDomainTimerNameTypeToString(timer->name));
+                return -1;
+            }
+        }
+
+        if (timer->tickpolicy != VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP &&
+            (timer->catchup.threshold != 0 ||
+             timer->catchup.limit != 0 ||
+             timer->catchup.slew != 0)) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("setting of timer catchup policies is only "
+                             "supported with tickpolicy='catchup'"));
+            return -1;
+        }
+
+        if (timer->name != VIR_DOMAIN_TIMER_NAME_TSC) {
+            if (timer->frequency != 0) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("timer %s doesn't support setting of "
+                                 "timer frequency"),
+                               virDomainTimerNameTypeToString(timer->name));
+                return -1;
+             }
+
+            if (timer->mode) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("timer %s doesn't support setting of "
+                                 "timer mode"),
+                               virDomainTimerNameTypeToString(timer->name));
+                return -1;
+             }
+        }
+
+        if (timer->name != VIR_DOMAIN_TIMER_NAME_PLATFORM &&
+            timer->name != VIR_DOMAIN_TIMER_NAME_RTC) {
+            if (timer->track != VIR_DOMAIN_TIMER_TRACK_NONE) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("timer %s doesn't support setting of "
+                                 "timer track"),
+                               virDomainTimerNameTypeToString(timer->name));
+                return -1;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+static void
+virDomainDefPostParseGraphics(virDomainDef *def)
+{
+    size_t i;
+
+    for (i = 0; i < def->ngraphics; i++) {
+        virDomainGraphicsDef *graphics = def->graphics[i];
+
+        /* If spice graphics is configured without ports and with autoport='no'
+         * then we start qemu with Spice to not listen anywhere.  Let's convert
+         * this configuration to the new listen type='none' which does the
+         * same. */
+        if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_SPICE) {
+            virDomainGraphicsListenDef *glisten = &graphics->listens[0];
+
+            if (glisten->type == VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS &&
+                graphics->data.spice.port == 0 &&
+                graphics->data.spice.tlsPort == 0 &&
+                !graphics->data.spice.autoport) {
+                VIR_FREE(glisten->address);
+                glisten->type = VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE;
+            }
+        }
+    }
+}
+
+
+/**
+ * virDomainPostParseCheckISCSIPath
+ * @srcpath: Source path read (a/k/a, IQN) either disk or hostdev
+ *
+ * The details of an IQN is defined by RFC 3720 and 3721, but
+ * we just need to make sure there's a lun provided. If not
+ * provided, then default to zero. For an ISCSI LUN that is
+ * is provided by /dev/disk/by-path/... , then that path will
+ * have the specific lun requested.
+ */
+static void
+virDomainPostParseCheckISCSIPath(char **srcpath)
+{
+    char *path = NULL;
+
+    if (strchr(*srcpath, '/'))
+        return;
+
+    path = g_strdup_printf("%s/0", *srcpath);
+    g_free(*srcpath);
+    *srcpath = g_steal_pointer(&path);
+}
+
+
+/* Find out the next usable "unit" of a specific controller */
+static int
+virDomainControllerSCSINextUnit(const virDomainDef *def,
+                                unsigned int controller)
+{
+    size_t i;
+
+    for (i = 0; i < def->scsiBusMaxUnit; i++) {
+        /* Default to assigning addresses using bus = target = 0 */
+        const virDomainDeviceDriveAddress addr = {controller, 0, 0, i, 0};
+
+        if (!virDomainSCSIDriveAddressIsUsed(def, &addr))
+            return i;
+    }
+
+    return -1;
+}
+
+
+static void
+virDomainHostdevAssignAddress(virDomainXMLOption *xmlopt G_GNUC_UNUSED,
+                              const virDomainDef *def,
+                              virDomainHostdevDef *hostdev)
+{
+    int next_unit = 0;
+    int controller = 0;
+
+    /* NB: Do not attempt calling virDomainDefMaybeAddController to
+     * automagically add a "new" controller. Doing so will result in
+     * qemuDomainFindOrCreateSCSIDiskController "finding" the controller
+     * in the domain def list and thus not hotplugging the controller as
+     * well as the hostdev in the event that there are either no SCSI
+     * controllers defined or there was no space on an existing one.
+     *
+     * Because we cannot add a controller, then we should not walk the
+     * defined controllers list in order to find empty space. Doing
+     * so fails to return the valid next unit number for the 2nd
+     * hostdev being added to the as yet to be created controller.
+     */
+    do {
+        next_unit = virDomainControllerSCSINextUnit(def, controller);
+        if (next_unit < 0)
+            controller++;
+    } while (next_unit < 0);
+
+
+    hostdev->info->type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE;
+    hostdev->info->addr.drive.controller = controller;
+    hostdev->info->addr.drive.bus = 0;
+    hostdev->info->addr.drive.target = 0;
+    hostdev->info->addr.drive.unit = next_unit;
+}
+
+
+static int
+virDomainHostdevDefPostParse(virDomainHostdevDef *dev,
+                             const virDomainDef *def,
+                             virDomainXMLOption *xmlopt)
+{
+    virDomainHostdevSubsysSCSI *scsisrc;
+    virDomainDeviceDriveAddress *addr = NULL;
+
+    if (dev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS)
+        return 0;
+
+    switch (dev->source.subsys.type) {
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
+        scsisrc = &dev->source.subsys.u.scsi;
+        if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
+            virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi;
+            virDomainPostParseCheckISCSIPath(&iscsisrc->src->path);
+        }
+
+        if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
+            virDomainHostdevAssignAddress(xmlopt, def, dev);
+
+        /* Ensure provided address doesn't conflict with existing
+         * scsi disk drive address
+         */
+        addr = &dev->info->addr.drive;
+        if (virDomainDriveAddressIsUsedByDisk(def,
+                                              VIR_DOMAIN_DISK_BUS_SCSI,
+                                              addr)) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("SCSI host address controller='%u' "
+                             "bus='%u' target='%u' unit='%u' in "
+                             "use by a SCSI disk"),
+                           addr->controller, addr->bus,
+                           addr->target, addr->unit);
+            return -1;
+        }
+        break;
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: {
+        int model = dev->source.subsys.u.mdev.model;
+
+        if (dev->info->type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
+            return 0;
+
+        if ((model == VIR_MDEV_MODEL_TYPE_VFIO_PCI &&
+             dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI) ||
+            (model == VIR_MDEV_MODEL_TYPE_VFIO_CCW &&
+             dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("Unsupported address type '%s' with mediated "
+                             "device model '%s'"),
+                           virDomainDeviceAddressTypeToString(dev->info->type),
+                           virMediatedDeviceModelTypeToString(model));
+            return -1;
+        }
+    }
+
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+        break;
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainChrIsaSerialDefPostParse(virDomainDef *def)
+{
+    size_t i;
+    size_t isa_serial_count = 0;
+    bool used_serial_port[VIR_MAX_ISA_SERIAL_PORTS] = { false };
+
+    /* Perform all the required checks. */
+    for (i = 0; i < def->nserials; i++) {
+        if (def->serials[i]->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL)
+            continue;
+
+        if (isa_serial_count++ >= VIR_MAX_ISA_SERIAL_PORTS ||
+            def->serials[i]->target.port >= VIR_MAX_ISA_SERIAL_PORTS) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("Maximum supported number of ISA serial ports is '%d'"),
+                           VIR_MAX_ISA_SERIAL_PORTS);
+            return -1;
+        }
+
+        if (def->serials[i]->target.port != -1) {
+            if (used_serial_port[def->serials[i]->target.port]) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               _("target port '%d' already allocated"),
+                               def->serials[i]->target.port);
+                return -1;
+            }
+            used_serial_port[def->serials[i]->target.port] = true;
+        }
+    }
+
+    /* Assign the ports to the devices. */
+    for (i = 0; i < def->nserials; i++) {
+        size_t j;
+
+        if (def->serials[i]->targetType != VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_ISA_SERIAL ||
+            def->serials[i]->target.port != -1)
+            continue;
+
+        for (j = 0; j < VIR_MAX_ISA_SERIAL_PORTS; j++) {
+            if (!used_serial_port[j]) {
+                def->serials[i]->target.port = j;
+                used_serial_port[j] = true;
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainChrDefPostParse(virDomainChrDef *chr,
+                         const virDomainDef *def)
+{
+    const virDomainChrDef **arrPtr;
+    size_t i, cnt;
+
+    virDomainChrGetDomainPtrs(def, chr->deviceType, &arrPtr, &cnt);
+
+    if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE &&
+        chr->targetType == VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE) {
+        chr->targetType = VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL;
+    }
+
+    if (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL &&
+        chr->targetType == VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_ISA_DEBUG &&
+        !ARCH_IS_X86(def->os.arch)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("isa-debug serial type only valid on x86 architecture"));
+        return -1;
+    }
+
+    if (chr->target.port == -1 &&
+        (chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL ||
+         chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL ||
+         chr->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE)) {
+        int maxport = -1;
+
+        for (i = 0; i < cnt; i++) {
+            if (arrPtr[i]->target.port > maxport)
+                maxport = arrPtr[i]->target.port;
+        }
+
+        chr->target.port = maxport + 1;
+    }
+
+    return 0;
+}
+
+
+static void
+virDomainRNGDefPostParse(virDomainRNGDef *rng)
+{
+    /* set default path for virtio-rng "random" backend to /dev/random */
+    if (rng->backend == VIR_DOMAIN_RNG_BACKEND_RANDOM &&
+        !rng->source.file) {
+        rng->source.file = g_strdup("/dev/random");
+    }
+}
+
+
+static void
+virDomainDiskExpandGroupIoTune(virDomainDiskDef *disk,
+                               const virDomainDef *def)
+{
+    size_t i;
+
+    if (!disk->blkdeviotune.group_name ||
+        virDomainBlockIoTuneInfoHasAny(&disk->blkdeviotune))
+        return;
+
+    for (i = 0; i < def->ndisks; i++) {
+        virDomainDiskDef *d = def->disks[i];
+
+        if (STRNEQ_NULLABLE(disk->blkdeviotune.group_name, d->blkdeviotune.group_name) ||
+            !virDomainBlockIoTuneInfoHasAny(&d->blkdeviotune))
+            continue;
+
+
+        VIR_FREE(disk->blkdeviotune.group_name);
+        virDomainBlockIoTuneInfoCopy(&d->blkdeviotune, &disk->blkdeviotune);
+
+        return;
+    }
+}
+
+
+static int
+virDomainDiskDefPostParse(virDomainDiskDef *disk,
+                          const virDomainDef *def,
+                          virDomainXMLOption *xmlopt)
+{
+    if (disk->dst) {
+        char *newdst;
+
+        /* Work around for compat with Xen driver in previous libvirt releases */
+        if ((newdst = g_strdup(STRSKIP(disk->dst, "ioemu:")))) {
+            g_free(disk->dst);
+            disk->dst = newdst;
+        }
+    }
+
+    /* Force CDROM to be listed as read only */
+    if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM)
+        disk->src->readonly = true;
+
+    if (disk->bus == VIR_DOMAIN_DISK_BUS_NONE) {
+        disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
+
+        if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
+            disk->bus = VIR_DOMAIN_DISK_BUS_FDC;
+        } else if (disk->dst) {
+            if (STRPREFIX(disk->dst, "hd"))
+                disk->bus = VIR_DOMAIN_DISK_BUS_IDE;
+            else if (STRPREFIX(disk->dst, "sd"))
+                disk->bus = VIR_DOMAIN_DISK_BUS_SCSI;
+            else if (STRPREFIX(disk->dst, "vd"))
+                disk->bus = VIR_DOMAIN_DISK_BUS_VIRTIO;
+            else if (STRPREFIX(disk->dst, "xvd"))
+                disk->bus = VIR_DOMAIN_DISK_BUS_XEN;
+            else if (STRPREFIX(disk->dst, "ubd"))
+                disk->bus = VIR_DOMAIN_DISK_BUS_UML;
+        }
+    }
+
+    if (disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT &&
+        disk->src->readonly)
+        disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
+
+    if (disk->src->type == VIR_STORAGE_TYPE_NETWORK &&
+        disk->src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI) {
+        virDomainPostParseCheckISCSIPath(&disk->src->path);
+    }
+
+    if (disk->src->type == VIR_STORAGE_TYPE_NVME) {
+        if (disk->src->nvme->managed == VIR_TRISTATE_BOOL_ABSENT)
+            disk->src->nvme->managed = VIR_TRISTATE_BOOL_YES;
+    }
+
+    /* vhost-user doesn't allow us to snapshot, disable snapshots by default */
+    if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER &&
+        disk->snapshot == VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT) {
+        disk->snapshot = VIR_DOMAIN_SNAPSHOT_LOCATION_NO;
+    }
+
+    if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
+        disk->dst &&
+        virDomainDiskDefAssignAddress(xmlopt, disk, def) < 0) {
+        return -1;
+    }
+
+    virDomainDiskExpandGroupIoTune(disk, def);
+
+    return 0;
+}
+
+
+static void
+virDomainVideoDefPostParse(virDomainVideoDef *video,
+                           const virDomainDef *def)
+{
+    /* Fill out (V)RAM if the driver-specific callback did not do so */
+    if (video->ram == 0 && video->type == VIR_DOMAIN_VIDEO_TYPE_QXL)
+        video->ram = virDomainVideoDefaultRAM(def, video->type);
+    if (video->vram == 0)
+        video->vram = virDomainVideoDefaultRAM(def, video->type);
+
+    video->ram = VIR_ROUND_UP_POWER_OF_TWO(video->ram);
+    video->vram = VIR_ROUND_UP_POWER_OF_TWO(video->vram);
+}
+
+
+static int
+virDomainControllerDefPostParse(virDomainControllerDef *cdev)
+{
+    if (cdev->iothread &&
+        cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_SCSI &&
+        cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL &&
+        cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("'iothread' attribute only supported for "
+                         "virtio scsi controllers"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
+static void
+virDomainVsockDefPostParse(virDomainVsockDef *vsock)
+{
+    if (vsock->auto_cid == VIR_TRISTATE_BOOL_ABSENT) {
+        if (vsock->guest_cid != 0)
+            vsock->auto_cid = VIR_TRISTATE_BOOL_NO;
+        else
+            vsock->auto_cid = VIR_TRISTATE_BOOL_YES;
+    }
+}
+
+
+static int
+virDomainMemoryDefPostParse(virDomainMemoryDef *mem,
+                            const virDomainDef *def)
+{
+    switch (mem->model) {
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        /* Virtio-pmem mandates shared access so that guest writes get
+         * reflected in the underlying file. */
+        if (mem->access == VIR_DOMAIN_MEMORY_ACCESS_DEFAULT)
+            mem->access = VIR_DOMAIN_MEMORY_ACCESS_SHARED;
+        break;
+
+    case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        /* If no NVDIMM UUID was provided in XML, generate one. */
+        if (ARCH_IS_PPC64(def->os.arch) &&
+            !mem->uuid) {
+
+            mem->uuid = g_new0(unsigned char, VIR_UUID_BUFLEN);
+            if (virUUIDGenerate(mem->uuid) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR,
+                               "%s", _("Failed to generate UUID"));
+                return -1;
+            }
+        }
+        break;
+
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_NONE:
+    case VIR_DOMAIN_MEMORY_MODEL_LAST:
+        break;
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainFSDefPostParse(virDomainFSDef *fs)
+{
+    if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_DEFAULT && !fs->sock)
+        fs->accessmode = VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH;
+
+    return 0;
+}
+
+
+static int
+virDomainDeviceDefPostParseCommon(virDomainDeviceDef *dev,
+                                  const virDomainDef *def,
+                                  unsigned int parseFlags G_GNUC_UNUSED,
+                                  virDomainXMLOption *xmlopt)
+{
+    int ret = -1;
+
+    switch ((virDomainDeviceType)dev->type) {
+    case VIR_DOMAIN_DEVICE_CHR:
+        ret = virDomainChrDefPostParse(dev->data.chr, def);
+        break;
+
+    case VIR_DOMAIN_DEVICE_RNG:
+        virDomainRNGDefPostParse(dev->data.rng);
+        ret = 0;
+        break;
+
+    case VIR_DOMAIN_DEVICE_DISK:
+        ret = virDomainDiskDefPostParse(dev->data.disk, def, xmlopt);
+        break;
+
+    case VIR_DOMAIN_DEVICE_VIDEO:
+        virDomainVideoDefPostParse(dev->data.video, def);
+        ret = 0;
+        break;
+
+    case VIR_DOMAIN_DEVICE_HOSTDEV:
+        ret = virDomainHostdevDefPostParse(dev->data.hostdev, def, xmlopt);
+        break;
+
+    case VIR_DOMAIN_DEVICE_CONTROLLER:
+        ret = virDomainControllerDefPostParse(dev->data.controller);
+        break;
+
+    case VIR_DOMAIN_DEVICE_VSOCK:
+        virDomainVsockDefPostParse(dev->data.vsock);
+        ret = 0;
+        break;
+
+    case VIR_DOMAIN_DEVICE_MEMORY:
+        ret = virDomainMemoryDefPostParse(dev->data.memory, def);
+        break;
+
+    case VIR_DOMAIN_DEVICE_FS:
+        ret = virDomainFSDefPostParse(dev->data.fs);
+        break;
+
+    case VIR_DOMAIN_DEVICE_LEASE:
+    case VIR_DOMAIN_DEVICE_NET:
+    case VIR_DOMAIN_DEVICE_INPUT:
+    case VIR_DOMAIN_DEVICE_SOUND:
+    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_SHMEM:
+    case VIR_DOMAIN_DEVICE_TPM:
+    case VIR_DOMAIN_DEVICE_PANIC:
+    case VIR_DOMAIN_DEVICE_IOMMU:
+    case VIR_DOMAIN_DEVICE_AUDIO:
+        ret = 0;
+        break;
+
+    case VIR_DOMAIN_DEVICE_NONE:
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("unexpected VIR_DOMAIN_DEVICE_NONE"));
+        break;
+
+    case VIR_DOMAIN_DEVICE_LAST:
+    default:
+        virReportEnumRangeError(virDomainDeviceType, dev->type);
+        break;
+    }
+
+    return ret;
+}
+
+
+/**
+ * virDomainDefCheckUnsupportedMemoryHotplug:
+ * @def: domain definition
+ *
+ * Returns -1 if the domain definition would enable memory hotplug via the
+ * <maxMemory> tunable and reports an error. Otherwise returns 0.
+ */
+static int
+virDomainDefCheckUnsupportedMemoryHotplug(virDomainDef *def)
+{
+    /* memory hotplug tunables are not supported by this driver */
+    if (virDomainDefHasMemoryHotplug(def)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("memory hotplug tunables <maxMemory> are not "
+                         "supported by this hypervisor driver"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
+/**
+ * virDomainDeviceDefCheckUnsupportedMemoryDevice:
+ * @dev: device definition
+ *
+ * Returns -1 if the device definition describes a memory device and reports an
+ * error. Otherwise returns 0.
+ */
+static int
+virDomainDeviceDefCheckUnsupportedMemoryDevice(virDomainDeviceDef *dev)
+{
+    /* This driver doesn't yet know how to handle memory devices */
+    if (dev->type == VIR_DOMAIN_DEVICE_MEMORY) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("memory devices are not supported by this driver"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
+/**
+ * virDomainDefRemoveOfflineVcpuPin:
+ * @def: domain definition
+ *
+ * This function removes vcpu pinning information from offline vcpus. This is
+ * designed to be used for drivers which don't support offline vcpupin.
+ */
+static void
+virDomainDefRemoveOfflineVcpuPin(virDomainDef *def)
+{
+    size_t i;
+    virDomainVcpuDef *vcpu;
+
+    for (i = 0; i < virDomainDefGetVcpusMax(def); i++) {
+        vcpu = virDomainDefGetVcpu(def, i);
+
+        if (vcpu && !vcpu->online && vcpu->cpumask) {
+            g_clear_pointer(&vcpu->cpumask, virBitmapFree);
+
+            VIR_WARN("Ignoring unsupported vcpupin for offline vcpu '%zu'", i);
+        }
+    }
+}
+
+
+#define UNSUPPORTED(FEATURE) (!((FEATURE) & xmlopt->config.features))
+/**
+ * virDomainDefPostParseCheckFeatures:
+ * @def: domain definition
+ * @xmlopt: XML parser option object
+ *
+ * This function checks that the domain configuration is supported according to
+ * the supported features for a given hypervisor. See virDomainDefFeatures and
+ * virDomainDefParserConfig.
+ *
+ * Returns 0 on success and -1 on error with an appropriate libvirt error.
+ */
+static int
+virDomainDefPostParseCheckFeatures(virDomainDef *def,
+                                   virDomainXMLOption *xmlopt)
+{
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG) &&
+        virDomainDefCheckUnsupportedMemoryHotplug(def) < 0)
+        return -1;
+
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_OFFLINE_VCPUPIN))
+        virDomainDefRemoveOfflineVcpuPin(def);
+
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NAME_SLASH)) {
+        if (def->name && strchr(def->name, '/')) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("name %s cannot contain '/'"), def->name);
+            return -1;
+        }
+    }
+
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_INDIVIDUAL_VCPUS) &&
+        def->individualvcpus) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("individual CPU state configuration is not supported"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
+/**
+ * virDomainDeviceDefPostParseCheckFeatures:
+ * @dev: device definition
+ * @xmlopt: XML parser option object
+ *
+ * This function checks that the device configuration is supported according to
+ * the supported features for a given hypervisor. See virDomainDefFeatures and
+ * virDomainDefParserConfig.
+ *
+ * Returns 0 on success and -1 on error with an appropriate libvirt error.
+ */
+static int
+virDomainDeviceDefPostParseCheckFeatures(virDomainDeviceDef *dev,
+                                         virDomainXMLOption *xmlopt)
+{
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_MEMORY_HOTPLUG) &&
+        virDomainDeviceDefCheckUnsupportedMemoryDevice(dev) < 0)
+        return -1;
+
+    if (UNSUPPORTED(VIR_DOMAIN_DEF_FEATURE_NET_MODEL_STRING) &&
+        dev->type == VIR_DOMAIN_DEVICE_NET &&
+        dev->data.net->modelstr) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("driver does not support net model '%s'"),
+                       dev->data.net->modelstr);
+        return -1;
+    }
+
+    return 0;
+}
+#undef UNSUPPORTED
+
+
+static int
+virDomainDeviceDefPostParse(virDomainDeviceDef *dev,
+                            const virDomainDef *def,
+                            unsigned int flags,
+                            virDomainXMLOption *xmlopt,
+                            void *parseOpaque)
+{
+    int ret;
+
+    if (xmlopt->config.devicesPostParseCallback) {
+        ret = xmlopt->config.devicesPostParseCallback(dev, def, flags,
+                                                      xmlopt->config.priv,
+                                                      parseOpaque);
+        if (ret < 0)
+            return ret;
+    }
+
+    if ((ret = virDomainDeviceDefPostParseCommon(dev, def, flags, xmlopt)) < 0)
+        return ret;
+
+    if (virDomainDeviceDefPostParseCheckFeatures(dev, xmlopt) < 0)
+        return -1;
+
+    return 0;
+}
+
+
+int
+virDomainDeviceDefPostParseOne(virDomainDeviceDef *dev,
+                               const virDomainDef *def,
+                               unsigned int flags,
+                               virDomainXMLOption *xmlopt,
+                               void *parseOpaque)
+{
+    void *data = NULL;
+    int ret;
+
+    if (!parseOpaque && xmlopt->config.domainPostParseDataAlloc) {
+        if (xmlopt->config.domainPostParseDataAlloc(def, flags,
+                                                    xmlopt->config.priv,
+                                                    &data) < 0)
+            return -1;
+        parseOpaque = data;
+    }
+
+    ret = virDomainDeviceDefPostParse(dev, def, flags, xmlopt, parseOpaque);
+
+    if (data && xmlopt->config.domainPostParseDataFree)
+        xmlopt->config.domainPostParseDataFree(data);
+
+    return ret;
+}
+
+
+struct virDomainDefPostParseDeviceIteratorData {
+    virDomainXMLOption *xmlopt;
+    void *parseOpaque;
+    unsigned int parseFlags;
+};
+
+
+static int
+virDomainDefPostParseDeviceIterator(virDomainDef *def,
+                                    virDomainDeviceDef *dev,
+                                    virDomainDeviceInfo *info G_GNUC_UNUSED,
+                                    void *opaque)
+{
+    struct virDomainDefPostParseDeviceIteratorData *data = opaque;
+    return virDomainDeviceDefPostParse(dev, def,
+                                       data->parseFlags, data->xmlopt,
+                                       data->parseOpaque);
+}
+
+
+static int
+virDomainVcpuDefPostParse(virDomainDef *def)
+{
+    virDomainVcpuDef *vcpu;
+    size_t maxvcpus = virDomainDefGetVcpusMax(def);
+    size_t i;
+
+    for (i = 0; i < maxvcpus; i++) {
+        vcpu = virDomainDefGetVcpu(def, i);
+
+        /* impossible but some compilers don't like it */
+        if (!vcpu)
+            continue;
+
+        switch (vcpu->hotpluggable) {
+        case VIR_TRISTATE_BOOL_ABSENT:
+            if (vcpu->online)
+                vcpu->hotpluggable = VIR_TRISTATE_BOOL_NO;
+            else
+                vcpu->hotpluggable = VIR_TRISTATE_BOOL_YES;
+            break;
+
+        case VIR_TRISTATE_BOOL_NO:
+            if (!vcpu->online) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("vcpu '%zu' is both offline and not "
+                                 "hotpluggable"), i);
+                return -1;
+            }
+            break;
+
+        case VIR_TRISTATE_BOOL_YES:
+        case VIR_TRISTATE_BOOL_LAST:
+            break;
+        }
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainDefPostParseCPU(virDomainDef *def)
+{
+    if (!def->cpu)
+        return 0;
+
+    if (def->cpu->mode == VIR_CPU_MODE_CUSTOM &&
+        !def->cpu->model &&
+        def->cpu->check != VIR_CPU_CHECK_DEFAULT) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("check attribute specified for CPU with no model"));
+        return -1;
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainDefCollectBootOrder(virDomainDef *def G_GNUC_UNUSED,
+                             virDomainDeviceDef *dev G_GNUC_UNUSED,
+                             virDomainDeviceInfo *info,
+                             void *data)
+{
+    GHashTable *bootHash = data;
+    g_autofree char *order = NULL;
+
+    if (info->bootIndex == 0)
+        return 0;
+
+    if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
+        dev->data.hostdev->parentnet) {
+        /* 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;
+    }
+    order = g_strdup_printf("%u", info->bootIndex);
+
+    if (virHashLookup(bootHash, order)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("boot order '%s' used for more than one device"),
+                       order);
+        return -1;
+    }
+
+    if (virHashAddEntry(bootHash, order, (void *) 1) < 0)
+        return -1;
+
+    return 0;
+}
+
+
+static int
+virDomainDefBootOrderPostParse(virDomainDef *def)
+{
+    g_autoptr(GHashTable) bootHash = virHashNew(NULL);
+
+    if (virDomainDeviceInfoIterate(def, virDomainDefCollectBootOrder, bootHash) < 0)
+        return -1;
+
+    if (def->os.nBootDevs > 0 && virHashSize(bootHash) > 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("per-device boot elements cannot be used"
+                         " together with os/boot elements"));
+        return -1;
+    }
+
+    if (def->os.nBootDevs == 0 && virHashSize(bootHash) == 0) {
+        def->os.nBootDevs = 1;
+        def->os.bootDevs[0] = VIR_DOMAIN_BOOT_DISK;
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainDefPostParseVideo(virDomainDef *def,
+                           void *opaque)
+{
+    if (def->nvideos == 0)
+        return 0;
+
+    if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_NONE) {
+        char *alias;
+
+        /* we don't want to format any values we automatically fill in for
+         * videos into the XML, so clear them, but retain any user-assigned
+         * alias */
+        alias = g_steal_pointer(&def->videos[0]->info.alias);
+        virDomainVideoDefClear(def->videos[0]);
+        def->videos[0]->type = VIR_DOMAIN_VIDEO_TYPE_NONE;
+        def->videos[0]->info.alias = g_steal_pointer(&alias);
+    } 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;
+
+        /* 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
+virDomainDefRejectDuplicateControllers(virDomainDef *def)
+{
+    int max_idx[VIR_DOMAIN_CONTROLLER_TYPE_LAST];
+    virBitmap *bitmaps[VIR_DOMAIN_CONTROLLER_TYPE_LAST] = { NULL };
+    virDomainControllerDef *cont;
+    size_t nbitmaps = 0;
+    int ret = -1;
+    size_t i;
+
+    memset(max_idx, -1, sizeof(max_idx));
+
+    for (i = 0; i < def->ncontrollers; i++) {
+        cont = def->controllers[i];
+        if (cont->idx > max_idx[cont->type])
+            max_idx[cont->type] = cont->idx;
+    }
+
+    /* multiple USB controllers with the same index are allowed */
+    max_idx[VIR_DOMAIN_CONTROLLER_TYPE_USB] = -1;
+
+    for (i = 0; i < VIR_DOMAIN_CONTROLLER_TYPE_LAST; i++) {
+        if (max_idx[i] >= 0)
+            bitmaps[i] = virBitmapNew(max_idx[i] + 1);
+        nbitmaps++;
+    }
+
+    for (i = 0; i < def->ncontrollers; i++) {
+        cont = def->controllers[i];
+
+        if (max_idx[cont->type] == -1)
+            continue;
+
+        if (virBitmapIsBitSet(bitmaps[cont->type], cont->idx)) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("Multiple '%s' controllers with index '%d'"),
+                           virDomainControllerTypeToString(cont->type),
+                           cont->idx);
+            goto cleanup;
+        }
+        ignore_value(virBitmapSetBit(bitmaps[cont->type], cont->idx));
+    }
+
+    ret = 0;
+ cleanup:
+    for (i = 0; i < nbitmaps; i++)
+        virBitmapFree(bitmaps[i]);
+    return ret;
+}
+
+
+static int
+virDomainDefRejectDuplicatePanics(virDomainDef *def)
+{
+    bool exists[VIR_DOMAIN_PANIC_MODEL_LAST];
+    size_t i;
+
+    for (i = 0; i < VIR_DOMAIN_PANIC_MODEL_LAST; i++)
+         exists[i] = false;
+
+    for (i = 0; i < def->npanics; i++) {
+        virDomainPanicModel model = def->panics[i]->model;
+        if (exists[model]) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("Multiple panic devices with model '%s'"),
+                           virDomainPanicModelTypeToString(model));
+            return -1;
+        }
+        exists[model] = true;
+    }
+
+    return 0;
+}
+
+
+static int
+virDomainDefPostParseCommon(virDomainDef *def,
+                            struct virDomainDefPostParseDeviceIteratorData *data,
+                            virDomainXMLOption *xmlopt)
+{
+    size_t i;
+
+    /* verify init path for container based domains */
+    if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("init binary must be specified"));
+        return -1;
+    }
+
+    if (virDomainVcpuDefPostParse(def) < 0)
+        return -1;
+
+    if (virDomainDefPostParseMemory(def, data->parseFlags) < 0)
+        return -1;
+
+    if (virDomainDefPostParseOs(def) < 0)
+        return -1;
+
+    virDomainDefPostParseMemtune(def);
+
+    if (virDomainDefRejectDuplicateControllers(def) < 0)
+        return -1;
+
+    if (virDomainDefRejectDuplicatePanics(def) < 0)
+        return -1;
+
+    if (def->os.type == VIR_DOMAIN_OSTYPE_HVM &&
+        !(data->xmlopt->config.features & VIR_DOMAIN_DEF_FEATURE_NO_BOOT_ORDER) &&
+        virDomainDefBootOrderPostParse(def) < 0)
+        return -1;
+
+    if (virDomainDefPostParseTimer(def) < 0)
+        return -1;
+
+    if (virDomainDefAddImplicitDevices(def, xmlopt) < 0)
+        return -1;
+
+    if (virDomainDefPostParseVideo(def, data) < 0)
+        return -1;
+
+    if (def->nserials != 0) {
+        virDomainDeviceDef device = {
+            .type = VIR_DOMAIN_DEVICE_CHR,
+            .data.chr = def->serials[0],
+        };
+
+        /* serials[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;
+    }
+
+    /* Implicit SCSI controllers without a defined model might have
+     * been added in AddImplicitDevices, after we've done the per-device
+     * post-parse. */
+    for (i = 0; i < def->ncontrollers; i++) {
+        if (def->controllers[i]->model == VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT &&
+            def->controllers[i]->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI) {
+            virDomainDeviceDef device = {
+                .type = VIR_DOMAIN_DEVICE_CONTROLLER,
+                .data.controller = def->controllers[i],
+            };
+            if (virDomainDefPostParseDeviceIterator(def, &device, NULL, data) < 0)
+                return -1;
+        }
+    }
+
+    /* clean up possibly duplicated metadata entries */
+    virXMLNodeSanitizeNamespaces(def->metadata);
+
+    virDomainDefPostParseGraphics(def);
+
+    if (virDomainDefPostParseCPU(def) < 0)
+        return -1;
+
+    return 0;
+}
+
+
+static int
+virDomainDefPostParseCheckFailure(virDomainDef *def,
+                                  unsigned int parseFlags,
+                                  int ret)
+{
+    if (ret != 0)
+        def->postParseFailed = true;
+
+    if (ret <= 0)
+        return ret;
+
+    if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_ALLOW_POST_PARSE_FAIL))
+        return -1;
+
+    virResetLastError();
+    return 0;
+}
+
+
+static void
+virDomainAssignControllerIndexes(virDomainDef *def)
+{
+    /* the index attribute of a controller is optional in the XML, but
+     * is required to be valid at any time after parse. When no index
+     * is provided for a controller, assign one automatically by
+     * looking at what indexes are already used for that controller
+     * type in the domain - the unindexed controller gets the lowest
+     * unused index.
+     */
+    size_t outer;
+
+    for (outer = 0; outer < def->ncontrollers; outer++) {
+        virDomainControllerDef *cont = def->controllers[outer];
+        virDomainControllerDef *prev = NULL;
+        size_t inner;
+
+        if (cont->idx != -1)
+            continue;
+
+        if (outer > 0 && IS_USB2_CONTROLLER(cont)) {
+            /* USB2 controllers are the only exception to the simple
+             * "assign the lowest unused index". A group of USB2
+             * "companions" should all be at the same index as other
+             * USB2 controllers in the group, but only do this
+             * automatically if it appears to be the intent. To prove
+             * intent: the USB controller on the list just prior to
+             * this one must also be a USB2 controller, and there must
+             * not yet be a controller with the exact same model of
+             * this one and the same index as the previously added
+             * controller (e.g., if this controller is a UHCI1, then
+             * the previous controller must be an EHCI1 or a UHCI[23],
+             * and there must not already be a UHCI1 controller with
+             * the same index as the previous controller). If all of
+             * these are satisfied, set this controller to the same
+             * index as the previous controller.
+             */
+            int prevIdx;
+
+            prevIdx = outer - 1;
+            while (prevIdx >= 0 &&
+                   def->controllers[prevIdx]->type != VIR_DOMAIN_CONTROLLER_TYPE_USB)
+                prevIdx--;
+            if (prevIdx >= 0)
+                prev = def->controllers[prevIdx];
+            /* if the last USB controller isn't USB2, that breaks
+             * the chain, so we need a new index for this new
+             * controller
+             */
+            if (prev && !IS_USB2_CONTROLLER(prev))
+                prev = NULL;
+
+            /* if prev != NULL, we've found a potential index to
+             * use. Make sure this index isn't already used by an
+             * existing USB2 controller of the same model as the new
+             * one.
+             */
+            for (inner = 0; prev && inner < def->ncontrollers; inner++) {
+                if (def->controllers[inner]->type == VIR_DOMAIN_CONTROLLER_TYPE_USB &&
+                    def->controllers[inner]->idx == prev->idx &&
+                    def->controllers[inner]->model == cont->model) {
+                    /* we already have a controller of this model with
+                     * the proposed index, so we need to move to a new
+                     * index for this controller
+                     */
+                    prev = NULL;
+                }
+            }
+            if (prev)
+                cont->idx = prev->idx;
+        }
+        /* if none of the above applied, prev will be NULL */
+        if (!prev)
+            cont->idx = virDomainControllerFindUnusedIndex(def, cont->type);
+    }
+}
+
+
+int
+virDomainDefPostParse(virDomainDef *def,
+                      unsigned int parseFlags,
+                      virDomainXMLOption *xmlopt,
+                      void *parseOpaque)
+{
+    int ret = -1;
+    bool localParseOpaque = false;
+    struct virDomainDefPostParseDeviceIteratorData data = {
+        .xmlopt = xmlopt,
+        .parseFlags = parseFlags,
+        .parseOpaque = parseOpaque,
+    };
+
+    def->postParseFailed = false;
+
+    /* call the basic post parse callback */
+    if (xmlopt->config.domainPostParseBasicCallback) {
+        ret = xmlopt->config.domainPostParseBasicCallback(def,
+                                                          xmlopt->config.priv);
+
+        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
+            goto cleanup;
+    }
+
+    if (!data.parseOpaque &&
+        xmlopt->config.domainPostParseDataAlloc) {
+        ret = xmlopt->config.domainPostParseDataAlloc(def, parseFlags,
+                                                      xmlopt->config.priv,
+                                                      &data.parseOpaque);
+
+        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
+            goto cleanup;
+        localParseOpaque = true;
+    }
+
+    /* this must be done before the hypervisor-specific callback,
+     * in case presence of a controller at a specific index is checked
+     */
+    virDomainAssignControllerIndexes(def);
+
+    /* call the domain config callback */
+    if (xmlopt->config.domainPostParseCallback) {
+        ret = xmlopt->config.domainPostParseCallback(def, parseFlags,
+                                                     xmlopt->config.priv,
+                                                     data.parseOpaque);
+        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
+            goto cleanup;
+    }
+
+    if (virDomainChrIsaSerialDefPostParse(def) < 0)
+            return -1;
+
+    /* iterate the devices */
+    ret = virDomainDeviceInfoIterateFlags(def,
+                                          virDomainDefPostParseDeviceIterator,
+                                          DOMAIN_DEVICE_ITERATE_ALL_CONSOLES |
+                                          DOMAIN_DEVICE_ITERATE_MISSING_INFO,
+                                          &data);
+
+    if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
+        goto cleanup;
+
+    if ((ret = virDomainDefPostParseCommon(def, &data, xmlopt)) < 0)
+        goto cleanup;
+
+    if (xmlopt->config.assignAddressesCallback) {
+        ret = xmlopt->config.assignAddressesCallback(def, parseFlags,
+                                                     xmlopt->config.priv,
+                                                     data.parseOpaque);
+        if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
+            goto cleanup;
+    }
+
+    if ((ret = virDomainDefPostParseCheckFeatures(def, xmlopt)) < 0)
+        goto cleanup;
+
+    ret = 0;
+
+ cleanup:
+    if (localParseOpaque && xmlopt->config.domainPostParseDataFree)
+        xmlopt->config.domainPostParseDataFree(data.parseOpaque);
+
+    if (ret == 1)
+        ret = -1;
+
+    return ret;
+}
diff --git a/src/conf/domain_postparse.h b/src/conf/domain_postparse.h
new file mode 100644
index 0000000000..fe5e28ea7c
--- /dev/null
+++ b/src/conf/domain_postparse.h
@@ -0,0 +1,37 @@
+/*
+ * domain_postparse.h: domain post parsing helpers
+ *
+ * Copyright (C) 2022 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "domain_conf.h"
+#include "virconftypes.h"
+
+int
+virDomainDeviceDefPostParseOne(virDomainDeviceDef *dev,
+                               const virDomainDef *def,
+                               unsigned int flags,
+                               virDomainXMLOption *xmlopt,
+                               void *parseOpaque);
+
+int
+virDomainDefPostParse(virDomainDef *def,
+                      unsigned int parseFlags,
+                      virDomainXMLOption *xmlopt,
+                      void *parseOpaque);
diff --git a/src/conf/meson.build b/src/conf/meson.build
index 82d265e975..5ef494c3ba 100644
--- a/src/conf/meson.build
+++ b/src/conf/meson.build
@@ -14,6 +14,7 @@ domain_conf_sources = [
   'domain_capabilities.c',
   'domain_conf.c',
   'domain_nwfilter.c',
+  'domain_postparse.c',
   'domain_validate.c',
   'moment_conf.c',
   'numa_conf.c',
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 76bcc64eb0..1e757389e6 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -343,7 +343,6 @@ virDomainDefNew;
 virDomainDefParseFile;
 virDomainDefParseNode;
 virDomainDefParseString;
-virDomainDefPostParse;
 virDomainDefSave;
 virDomainDefSetMemoryTotal;
 virDomainDefSetVcpus;
@@ -774,6 +773,10 @@ virDomainConfNWFilterTeardown;
 virDomainConfVMNWFilterTeardown;
 
 
+# conf/domain_postparse.h
+virDomainDefPostParse;
+
+
 # conf/domain_validate.h
 virDomainActualNetDefValidate;
 virDomainDefValidate;
diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index e62f591dcd..4de4e3140f 100644
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -27,6 +27,7 @@
 #include "virerror.h"
 #include "virlog.h"
 #include "domain_conf.h"
+#include "domain_postparse.h"
 #include "viralloc.h"
 #include "virstring.h"
 #include "storage_source_backingstore.h"
diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index d6213a852d..081d323c2a 100644
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -29,6 +29,7 @@
 #include "xenxs_private.h"
 #include "xen_xm.h"
 #include "domain_conf.h"
+#include "domain_postparse.h"
 #include "xen_common.h"
 
 #define VIR_FROM_THIS VIR_FROM_XENXM
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 025c376ad2..3d0060e1b0 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -29,6 +29,7 @@
 #include "util/virstring.h"
 #include "util/virconf.h"
 #include "conf/domain_conf.h"
+#include "conf/domain_postparse.h"
 #include "virutil.h"
 
 #define VIR_FROM_THIS VIR_FROM_LXC
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 97c6ed95af..c4418df1ed 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -67,6 +67,7 @@
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_driver.h"
+#include "domain_postparse.h"
 #include "domain_validate.h"
 #include "virpci.h"
 #include "virpidfile.h"
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 771a623ef7..486be9344a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -75,6 +75,7 @@
 #include "domain_audit.h"
 #include "domain_cgroup.h"
 #include "domain_nwfilter.h"
+#include "domain_postparse.h"
 #include "domain_validate.h"
 #include "locking/domain_lock.h"
 #include "viruuid.h"
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 43ddee5bb6..f7261f5d2d 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -31,6 +31,7 @@
 #include "viruri.h"
 #include "virstring.h"
 #include "virutil.h"
+#include "domain_postparse.h"
 
 VIR_LOG_INIT("vmx.vmx");
 
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul  7 10:07:07 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu,  7 Jul 2022 12:07:07 +0200
Subject: [PATCH 1/3] domain_conf: Unexport
 virDomainDefPostParseDeviceIteratorData
In-Reply-To: <cover.1657188411.git.mprivozn@redhat.com>
References: <cover.1657188411.git.mprivozn@redhat.com>
Message-ID: <42c61a993286537188f847d0f1037ae5b9d03723.1657188411.git.mprivozn@redhat.com>

The virDomainDefPostParseDeviceIteratorData struct is exported in
domain_conf.h because it's used in both domain_conf.c and
domain_validate.c. However, the latter usage is not warranted,
it's just a shortcut so that we don't have to introduce a similar
struct just for domain_validate.c. Well, do the extra step and
introduce a separate structure for domain_validate.c. This allows
us to move post parse code later on.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c     |  7 +++++++
 src/conf/domain_conf.h     |  6 ------
 src/conf/domain_validate.c | 11 +++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2c2f23242e..c67fcd337d 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -6031,6 +6031,13 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDef *dev,
 }
 
 
+struct virDomainDefPostParseDeviceIteratorData {
+    virDomainXMLOption *xmlopt;
+    void *parseOpaque;
+    unsigned int parseFlags;
+};
+
+
 static int
 virDomainDefPostParseDeviceIterator(virDomainDef *def,
                                     virDomainDeviceDef *dev,
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 4c8c42b7eb..543b343be9 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3302,12 +3302,6 @@ struct _virDomainXMLOption {
 };
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainXMLOption, virObjectUnref);
 
-struct virDomainDefPostParseDeviceIteratorData {
-    virDomainXMLOption *xmlopt;
-    void *parseOpaque;
-    unsigned int parseFlags;
-};
-
 bool
 virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
                                 const virDomainDeviceDriveAddress *addr);
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 57d4e63a26..814922cd46 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1889,13 +1889,20 @@ virDomainDefValidateInternal(const virDomainDef *def,
 }
 
 
+struct virDomainDefValidateDeviceIteratorData {
+    virDomainXMLOption *xmlopt;
+    void *parseOpaque;
+    unsigned int parseFlags;
+};
+
+
 static int
 virDomainDefValidateDeviceIterator(virDomainDef *def,
                                    virDomainDeviceDef *dev,
                                    virDomainDeviceInfo *info G_GNUC_UNUSED,
                                    void *opaque)
 {
-    struct virDomainDefPostParseDeviceIteratorData *data = opaque;
+    struct virDomainDefValidateDeviceIteratorData *data = opaque;
     return virDomainDeviceDefValidate(dev, def,
                                       data->parseFlags, data->xmlopt,
                                       data->parseOpaque);
@@ -1924,7 +1931,7 @@ virDomainDefValidate(virDomainDef *def,
                      virDomainXMLOption *xmlopt,
                      void *parseOpaque)
 {
-    struct virDomainDefPostParseDeviceIteratorData data = {
+    struct virDomainDefValidateDeviceIteratorData data = {
         .xmlopt = xmlopt,
         .parseFlags = parseFlags,
         .parseOpaque = parseOpaque,
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul  7 10:07:09 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu,  7 Jul 2022 12:07:09 +0200
Subject: [PATCH 3/3] domain_postparse: Move error messages onto single line
In-Reply-To: <cover.1657188411.git.mprivozn@redhat.com>
References: <cover.1657188411.git.mprivozn@redhat.com>
Message-ID: <d210f98af25e4862cf780c4f80f3cf3de3c4ec22.1657188411.git.mprivozn@redhat.com>

Our coding style suggests 80 chars per line with error messages
being exception (for easier git-grep). Apply this exception onto
the newly created domain_postparse.c file.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_postparse.c | 49 ++++++++++++-------------------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
index 18f06dcca8..df59de2d0d 100644
--- a/src/conf/domain_postparse.c
+++ b/src/conf/domain_postparse.c
@@ -57,16 +57,14 @@ virDomainDefPostParseMemory(virDomainDef *def,
          * properly. */
         if (hotplugMemory > def->mem.total_memory) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("Total size of memory devices exceeds the total "
-                             "memory size"));
+                           _("Total size of memory devices exceeds the total memory size"));
             return -1;
         }
     }
 
     if (virDomainDefGetMemoryInitial(def) == 0) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("Memory size must be specified via <memory> or in the "
-                         "<numa> configuration"));
+                       _("Memory size must be specified via <memory> or in the <numa> configuration"));
         return -1;
     }
 
@@ -77,16 +75,14 @@ virDomainDefPostParseMemory(virDomainDef *def,
     if ((def->mem.max_memory || def->mem.memory_slots) &&
         !(def->mem.max_memory && def->mem.memory_slots)) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("both maximum memory size and "
-                         "memory slot count must be specified"));
+                       _("both maximum memory size and memory slot count must be specified"));
         return -1;
     }
 
     if (def->mem.max_memory &&
         def->mem.max_memory < virDomainDefGetMemoryTotal(def)) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("maximum memory size must be equal or greater than "
-                         "the actual memory size"));
+                       _("maximum memory size must be equal or greater than the actual memory size"));
         return -1;
     }
 
@@ -102,8 +98,7 @@ virDomainDefPostParseOs(virDomainDef *def)
 
         if (def->os.firmwareFeatures[VIR_DOMAIN_OS_DEF_FIRMWARE_FEATURE_SECURE_BOOT] == VIR_TRISTATE_BOOL_NO) {
             virReportError(VIR_ERR_XML_DETAIL, "%s",
-                           _("firmware feature 'enrolled-keys' cannot be enabled when "
-                             "firmware feature 'secure-boot' is disabled"));
+                           _("firmware feature 'enrolled-keys' cannot be enabled when firmware feature 'secure-boot' is disabled"));
             return -1;
         }
 
@@ -165,8 +160,7 @@ virDomainDefPostParseTimer(virDomainDef *def)
             timer->name == VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK) {
             if (timer->tickpolicy) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer tickpolicy"),
+                               _("timer %s doesn't support setting of timer tickpolicy"),
                                virDomainTimerNameTypeToString(timer->name));
                 return -1;
             }
@@ -177,24 +171,21 @@ virDomainDefPostParseTimer(virDomainDef *def)
              timer->catchup.limit != 0 ||
              timer->catchup.slew != 0)) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
-                           _("setting of timer catchup policies is only "
-                             "supported with tickpolicy='catchup'"));
+                           _("setting of timer catchup policies is only supported with tickpolicy='catchup'"));
             return -1;
         }
 
         if (timer->name != VIR_DOMAIN_TIMER_NAME_TSC) {
             if (timer->frequency != 0) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer frequency"),
+                               _("timer %s doesn't support setting of timer frequency"),
                                virDomainTimerNameTypeToString(timer->name));
                 return -1;
              }
 
             if (timer->mode) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer mode"),
+                               _("timer %s doesn't support setting of timer mode"),
                                virDomainTimerNameTypeToString(timer->name));
                 return -1;
              }
@@ -204,8 +195,7 @@ virDomainDefPostParseTimer(virDomainDef *def)
             timer->name != VIR_DOMAIN_TIMER_NAME_RTC) {
             if (timer->track != VIR_DOMAIN_TIMER_TRACK_NONE) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("timer %s doesn't support setting of "
-                                 "timer track"),
+                               _("timer %s doesn't support setting of timer track"),
                                virDomainTimerNameTypeToString(timer->name));
                 return -1;
             }
@@ -351,9 +341,7 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *dev,
                                               VIR_DOMAIN_DISK_BUS_SCSI,
                                               addr)) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("SCSI host address controller='%u' "
-                             "bus='%u' target='%u' unit='%u' in "
-                             "use by a SCSI disk"),
+                           _("SCSI host address controller='%u' bus='%u' target='%u' unit='%u' in use by a SCSI disk"),
                            addr->controller, addr->bus,
                            addr->target, addr->unit);
             return -1;
@@ -370,8 +358,7 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *dev,
             (model == VIR_MDEV_MODEL_TYPE_VFIO_CCW &&
              dev->info->type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)) {
             virReportError(VIR_ERR_XML_ERROR,
-                           _("Unsupported address type '%s' with mediated "
-                             "device model '%s'"),
+                           _("Unsupported address type '%s' with mediated device model '%s'"),
                            virDomainDeviceAddressTypeToString(dev->info->type),
                            virMediatedDeviceModelTypeToString(model));
             return -1;
@@ -611,8 +598,7 @@ virDomainControllerDefPostParse(virDomainControllerDef *cdev)
         cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_TRANSITIONAL &&
         cdev->model != VIR_DOMAIN_CONTROLLER_MODEL_SCSI_VIRTIO_NON_TRANSITIONAL) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("'iothread' attribute only supported for "
-                         "virtio scsi controllers"));
+                       _("'iothread' attribute only supported for virtio scsi controllers"));
         return -1;
     }
 
@@ -774,8 +760,7 @@ virDomainDefCheckUnsupportedMemoryHotplug(virDomainDef *def)
     /* memory hotplug tunables are not supported by this driver */
     if (virDomainDefHasMemoryHotplug(def)) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("memory hotplug tunables <maxMemory> are not "
-                         "supported by this hypervisor driver"));
+                       _("memory hotplug tunables <maxMemory> are not supported by this hypervisor driver"));
         return -1;
     }
 
@@ -1003,8 +988,7 @@ virDomainVcpuDefPostParse(virDomainDef *def)
         case VIR_TRISTATE_BOOL_NO:
             if (!vcpu->online) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("vcpu '%zu' is both offline and not "
-                                 "hotpluggable"), i);
+                               _("vcpu '%zu' is both offline and not hotpluggable"), i);
                 return -1;
             }
             break;
@@ -1083,8 +1067,7 @@ virDomainDefBootOrderPostParse(virDomainDef *def)
 
     if (def->os.nBootDevs > 0 && virHashSize(bootHash) > 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("per-device boot elements cannot be used"
-                         " together with os/boot elements"));
+                       _("per-device boot elements cannot be used together with os/boot elements"));
         return -1;
     }
 
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul  7 10:34:04 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 7 Jul 2022 12:34:04 +0200
Subject: [PATCH] virt-xml-validate: Fix incorrect wildcards for XML roots
In-Reply-To: <20220706020252.887907-1-hhan@redhat.com>
References: <20220706020252.887907-1-hhan@redhat.com>
Message-ID: <160c35e9-cf5a-bca1-70ed-10641378afb8@redhat.com>

On 7/6/22 04:02, Han Han wrote:
> To match the XML roots domainCapabilities and storagepoolCapabilities,
> the wildcards should be *domainCap* and *storagepoolCap*.
> 
> Fixes: 7b0e2e4a55
> Signed-off-by: Han Han <hhan at redhat.com>
> ---
>  tools/virt-xml-validate.in | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Thu Jul  7 10:34:16 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 7 Jul 2022 12:34:16 +0200
Subject: [PATCH] schemas: rng: Make secret optional in storage vol
In-Reply-To: <20220706024202.895610-1-hhan@redhat.com>
References: <20220706024202.895610-1-hhan@redhat.com>
Message-ID: <ddf27389-6a16-1fae-2f03-34c58bbc7729@redhat.com>

On 7/6/22 04:42, Han Han wrote:
> For a qcow2 storage volume with luks encryption created by qemu-img, its
> dumped storage vol XML has no secret element in encryption:
> <volume type='file'>
>     ...
>     <encryption format='luks'>
>     </encryption>
>     ...
> </volume>
> 
> That will cause a failure in rng validation. Fix that validation failure.
> 
> Signed-off-by: Han Han <hhan at redhat.com>
> ---
>  src/conf/schemas/storagecommon.rng | 24 +++++++++++++-----------
>  1 file changed, 13 insertions(+), 11 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Thu Jul  7 10:34:30 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 7 Jul 2022 12:34:30 +0200
Subject: [PATCH] docs: Fix syntax error for defaultiothread
In-Reply-To: <20220706062030.927472-1-hhan@redhat.com>
References: <20220706062030.927472-1-hhan@redhat.com>
Message-ID: <dba17b7f-7861-3ccd-584e-f5603b8ef0b9@redhat.com>

On 7/6/22 08:20, Han Han wrote:
> Signed-off-by: Han Han <hhan at redhat.com>
> ---
>  docs/formatdomain.rst | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mkletzan at redhat.com  Thu Jul  7 11:21:35 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 7 Jul 2022 13:21:35 +0200
Subject: [PATCH RFC v2 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <20220705232628.1779286-2-natto@weirdnatto.in>
References: <20220705232628.1779286-1-natto@weirdnatto.in>
 <20220705232628.1779286-2-natto@weirdnatto.in>
Message-ID: <YsbBv8JTZOnU6Y7Z@wheatley>

On Wed, Jul 06, 2022 at 04:56:26AM +0530, Amneesh Singh wrote:
>Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
>This patch adds an API for the "query-stats" QMP command.
>
>The query returns a JSON containing the statistics based on the target,
>which can either be vCPU or VM, and the providers. The API deserializes
>the query result into an array of GHashMaps, which can later be used to
>extract all the query statistics. GHashMaps are used to avoid traversing
>the entire array to find the statistics you are looking for. This would
>be a singleton array if the target is a VM since the returned JSON is
>also a singleton array in that case.
>
>Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>---
> src/qemu/qemu_monitor.c      | 106 ++++++++++++++++++++++++++++
> src/qemu/qemu_monitor.h      |  56 +++++++++++++++
> src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
> src/qemu/qemu_monitor_json.h |   6 ++
> 4 files changed, 298 insertions(+)
>
>diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
>index fda5d2f3..528aed49 100644
>--- a/src/qemu/qemu_monitor.c
>+++ b/src/qemu/qemu_monitor.c
>@@ -4541,3 +4541,109 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
>
>     return qemuMonitorJSONMigrateRecover(mon, uri);
> }
>+
>+VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
>+              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
>+              "vm",
>+              "vcpu",
>+);
>+
>+VIR_ENUM_IMPL(qemuMonitorQueryStatsVmName,
>+              QEMU_MONITOR_QUERY_STATS_VM_NAME_LAST,
>+);
>+
>+VIR_ENUM_IMPL(qemuMonitorQueryStatsVcpuName,
>+              QEMU_MONITOR_QUERY_STATS_VCPU_NAME_LAST,
>+              "halt_poll_success_ns",
>+              "halt_poll_fail_ns"
>+);
>+

As we discussed these two can be joined together and the code will look
much nicer.  I don't think we need to differentiate between those,
definitely not now sice the former one is not even used yet.

>+VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
>+              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
>+              "kvm",
>+);
>+
>+const char *
>+qemuMonitorQueryStatsNameTypeToString(qemuMonitorQueryStatsTargetType target,
>+                                      int type)

With the merged enums this function will not be needed at all, and there
are other similar cases, but since you suggested yourself you know it
very well too ;)

>+{
>+    switch (target) {
>+    case QEMU_MONITOR_QUERY_STATS_TARGET_VM:
>+        return qemuMonitorQueryStatsVmNameTypeToString(type);
>+    case QEMU_MONITOR_QUERY_STATS_TARGET_VCPU:
>+        return qemuMonitorQueryStatsVcpuNameTypeToString(type);
>+
>+    /* unreachable */
>+    case QEMU_MONITOR_QUERY_STATS_TARGET_LAST:
>+        ;
>+    }
>+
>+    return NULL;
>+}
>+
>+void
>+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
>+{
>+    virBitmapFree(provider->names);
>+    g_free(provider);
>+}
>+
>+qemuMonitorQueryStatsProvider *
>+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsTargetType target,
>+                                 qemuMonitorQueryStatsProviderType provider_type,
>+                                 ...)
>+{
>+    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
>+    va_list name_list;
>+    int stat;
>+
>+    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
>+    provider->provider = provider_type;
>+    provider->names = NULL;
>+
>+    va_start(name_list, provider_type);
>+    stat = va_arg(name_list, int);

I have a suspicion that sizeof(enum ...) is guaranteed to equal
sizeof(int) everywhere.  But you should just be able to do

va_arg(name_list, qemuMonitorQueryStats)

>+
>+    if (stat != -1) {

and instead of -1 you can pass and check the _LAST value.

>+        size_t sz = 0;
>+
>+        switch (target) {
>+        case QEMU_MONITOR_QUERY_STATS_TARGET_VM:
>+            sz = QEMU_MONITOR_QUERY_STATS_VM_NAME_LAST;
>+            break;
>+        case QEMU_MONITOR_QUERY_STATS_TARGET_VCPU:
>+            sz = QEMU_MONITOR_QUERY_STATS_VCPU_NAME_LAST;
>+            break;
>+        case QEMU_MONITOR_QUERY_STATS_TARGET_LAST:
>+            break;
>+        }
>+
>+        provider->names = virBitmapNew(sz);
>+
>+        while (stat != -1) {
>+            if (virBitmapSetBit(provider->names, stat) < 0)
>+                return NULL;
>+            stat = va_arg(name_list, int);
>+        }
>+    }
>+
>+    va_end(name_list);
>+
>+    return g_steal_pointer(&provider);
>+}
>+
>+GPtrArray *
>+qemuMonitorQueryStats(qemuMonitor *mon,
>+                      qemuMonitorQueryStatsTargetType target,
>+                      char **vcpus,
>+                      GPtrArray *providers)
>+{
>+    VIR_DEBUG("target=%u vcpus=%p providers=%p", target, vcpus, providers);
>+
>+    QEMU_CHECK_MONITOR_NULL(mon);
>+
>+    if (target != QEMU_MONITOR_QUERY_STATS_TARGET_VCPU && !vcpus)

I think you meant:

if (target != QEMU_MONITOR_QUERY_STATS_TARGET_VCPU && vcpus)

>+        return NULL;
>+
>+    return qemuMonitorJSONQueryStats(mon, target, vcpus, providers);
>+}
>diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
>index 95267ec6..26df9c63 100644
>--- a/src/qemu/qemu_monitor.h
>+++ b/src/qemu/qemu_monitor.h
>@@ -1554,3 +1554,59 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
> int
> qemuMonitorMigrateRecover(qemuMonitor *mon,
>                           const char *uri);
>+
>+typedef enum {
>+    QEMU_MONITOR_QUERY_STATS_TARGET_VM,
>+    QEMU_MONITOR_QUERY_STATS_TARGET_VCPU,
>+    QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
>+} qemuMonitorQueryStatsTargetType;
>+
>+VIR_ENUM_DECL(qemuMonitorQueryStatsTarget);
>+
>+typedef enum {
>+    QEMU_MONITOR_QUERY_STATS_VM_NAME_LAST,
>+} qemuMonitorQueryStatsVmNameType;
>+
>+VIR_ENUM_DECL(qemuMonitorQueryStatsVmName);
>+
>+typedef enum {
>+    QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS,
>+    QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS,
>+    QEMU_MONITOR_QUERY_STATS_VCPU_NAME_LAST,
>+} qemuMonitorQueryStatsVcpuNameType;
>+
>+VIR_ENUM_DECL(qemuMonitorQueryStatsVcpuName);
>+
>+const char *
>+qemuMonitorQueryStatsNameTypeToString(qemuMonitorQueryStatsTargetType target,
>+                                      int type);
>+
>+typedef enum {
>+    QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
>+    QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
>+} qemuMonitorQueryStatsProviderType;
>+
>+VIR_ENUM_DECL(qemuMonitorQueryStatsProvider);
>+
>+typedef struct _qemuMonitorQueryStatsProvider qemuMonitorQueryStatsProvider;
>+struct _qemuMonitorQueryStatsProvider {
>+    qemuMonitorQueryStatsProviderType provider;
>+    virBitmap *names;
>+};
>+
>+void
>+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider);
>+
>+qemuMonitorQueryStatsProvider *
>+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsTargetType target,
>+                                 qemuMonitorQueryStatsProviderType provider_type,
>+                                 ...);
>+
>+G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorQueryStatsProvider,
>+                              qemuMonitorQueryStatsProviderFree);
>+
>+GPtrArray *
>+qemuMonitorQueryStats(qemuMonitor *mon,
>+                      qemuMonitorQueryStatsTargetType target,
>+                      char **vcpus,
>+                      GPtrArray *providers);
>diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
>index 3aad2ab2..8774b1ff 100644
>--- a/src/qemu/qemu_monitor_json.c
>+++ b/src/qemu/qemu_monitor_json.c
>@@ -9006,3 +9006,133 @@ qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
>
>     return qemuMonitorJSONCheckError(cmd, reply);
> }
>+
>+static GPtrArray *
>+qemuMonitorJSONExtractQueryStats(virJSONValue *arr)
>+{
>+    g_autoptr(GPtrArray) queried_stats = NULL;
>+    size_t nstats = virJSONValueArraySize(arr);
>+    size_t i;
>+
>+    /* Create a GPtrArray for GHashTables */
>+    queried_stats = g_ptr_array_new_full(nstats, (GDestroyNotify) g_hash_table_destroy);
>+
>+    for (i = 0; i < nstats; i++) {
>+        virJSONValue *obj = virJSONValueArrayGet(arr, i);
>+        virJSONValue *stats = virJSONValueObjectGetArray(obj, "stats");
>+        size_t j;
>+
>+        /* Create a GHashTable for virJSONValues */
>+        GHashTable *hash_table = virHashNew((GDestroyNotify) virJSONValueFree);
>+
>+        for (j = 0; j < virJSONValueArraySize(stats); j++) {
>+            virJSONValue *stat = virJSONValueArrayGet(stats, j);
>+
>+            g_hash_table_insert(hash_table,
>+                                g_strdup(virJSONValueObjectGetString(stat, "name")),
>+                                virJSONValueObjectGet(stat, "value"));
>+        }
>+
>+        g_ptr_array_add(queried_stats, hash_table);
>+    }
>+
>+    return g_steal_pointer(&queried_stats);
>+}
>+
>+
>+/**
>+ * qemuMonitorJSONQueryStats:
>+ * @mon: monitor object
>+ * @target: the target type for the query
>+ * @vcpus: a list of vCPU QOM paths for filtering the statistics
>+ * @providers: an array of providers to filter statistics
>+ *
>+ * @vcpus is a NULL terminated array of strings. @providers is a GPtrArray
>+ * for qemuMonitorQueryStatsProvider.
>+ * @vcpus and @providers are optional and can be NULL.
>+ *
>+ * Queries for the @target based statistics.
>+ * Returns a GPtrArray of GHashTables containing the statistics on success or
>+ * NULL on failure.
>+ */
>+
>+GPtrArray *
>+qemuMonitorJSONQueryStats(qemuMonitor *mon,
>+                          qemuMonitorQueryStatsTargetType target,
>+                          char **vcpus,
>+                          GPtrArray *providers)
>+{
>+    g_autoptr(virJSONValue) cmd = NULL;
>+    g_autoptr(virJSONValue) reply = NULL;
>+    g_autoptr(virJSONValue) vcpu_list = NULL;
>+    g_autoptr(virJSONValue) provider_list = NULL;
>+    virJSONValue *rv = NULL;
>+
>+    size_t i;
>+
>+    if (providers) {
>+        provider_list = virJSONValueNewArray();
>+
>+        for (i = 0; i < providers->len; i++) {
>+            g_autoptr(virJSONValue) provider_obj = virJSONValueNewObject();
>+            qemuMonitorQueryStatsProvider *provider = providers->pdata[i];
>+            const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->provider);
>+            virBitmap *names = provider->names;
>+            int rc;
>+
>+            rc = virJSONValueObjectAppendString(provider_obj, "provider", type_str);
>+
>+            if (rc < 0)
>+                return NULL;
>+
>+            if (names) {
>+                g_autoptr(virJSONValue) provider_names = virJSONValueNewArray();
>+                int curBit = virBitmapNextSetBit(names, -1);
>+
>+                while (curBit >= 0) {
>+                    const char *name = qemuMonitorQueryStatsNameTypeToString(target, curBit);
>+
>+                    if (virJSONValueArrayAppendString(provider_names, name) < 0)
>+                        return NULL;
>+
>+                    curBit = virBitmapNextSetBit(names, curBit);
>+                }
>+
>+                rc = virJSONValueObjectAppend(provider_obj, "names", &provider_names);
>+
>+                if (rc < 0)
>+                    return NULL;
>+            }
>+
>+            if (virJSONValueArrayAppend(provider_list, &provider_obj) < 0)
>+                return NULL;
>+        }
>+    }
>+
>+    if (vcpus) {
>+        vcpu_list = virJSONValueNewArray();
>+
>+        for (i = 0; vcpus[i]; i++)
>+            if (virJSONValueArrayAppendString(vcpu_list, vcpus[i]) < 0)
>+                return NULL;
>+    }
>+
>+    cmd = qemuMonitorJSONMakeCommand("query-stats",
>+                                     "s:target", qemuMonitorQueryStatsTargetTypeToString(target),
>+                                     "A:vcpus", &vcpu_list,
>+                                     "A:providers", &provider_list,
>+                                     NULL);
>+
>+    if (!cmd)
>+        return NULL;
>+
>+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
>+        return NULL;
>+
>+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
>+        return NULL;
>+
>+    rv = virJSONValueObjectStealArray(reply, "return");
>+
>+    return qemuMonitorJSONExtractQueryStats(rv);
>+}
>diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
>index ad3853ae..db8dec80 100644
>--- a/src/qemu/qemu_monitor_json.h
>+++ b/src/qemu/qemu_monitor_json.h
>@@ -878,3 +878,9 @@ qemuMonitorJSONChangeMemoryRequestedSize(qemuMonitor *mon,
> int
> qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
>                               const char *uri);
>+
>+GPtrArray *
>+qemuMonitorJSONQueryStats(qemuMonitor *mon,
>+                          qemuMonitorQueryStatsTargetType target,
>+                          char **vcpus,
>+                          GPtrArray *providers);
>-- 
>2.36.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/73ca9f4f/attachment-0001.sig>

From mkletzan at redhat.com  Thu Jul  7 11:22:13 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 7 Jul 2022 13:22:13 +0200
Subject: [PATCH RFC v2 2/3] qemu_capabilities: add "query-stats" QMP
 command to the QEMU capabilities
In-Reply-To: <20220705232628.1779286-3-natto@weirdnatto.in>
References: <20220705232628.1779286-1-natto@weirdnatto.in>
 <20220705232628.1779286-3-natto@weirdnatto.in>
Message-ID: <YsbB5Zzjn9hqDXGB@wheatley>

On Wed, Jul 06, 2022 at 04:56:27AM +0530, Amneesh Singh wrote:
>Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
>This patch adds "query-stats" to the QEMU capabilities.
>
>Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>---
> 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 2c3be3ec..81fc597a 100644
>--- a/src/qemu/qemu_capabilities.c
>+++ b/src/qemu/qemu_capabilities.c
>@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>               "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
>               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
>               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
>+              "query-stats", /* QEMU_CAPS_QUERY_STATS */
>     );
>
>
>@@ -1225,6 +1226,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
>     { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
>     { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
>     { "calc-dirty-rate", QEMU_CAPS_CALC_DIRTY_RATE },
>+    { "query-stats", QEMU_CAPS_QUERY_STATS },
> };
>
> struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
>diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
>index 6f35ba14..29e55b3a 100644
>--- a/src/qemu/qemu_capabilities.h
>+++ b/src/qemu/qemu_capabilities.h
>@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
>     QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
>     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
>     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
>+    QEMU_CAPS_QUERY_STATS,  /*accepts query-stats */

missing space after /*

with that

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>

>
>     QEMU_CAPS_LAST /* this must always be the last item */
> } virQEMUCapsFlags;
>-- 
>2.36.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/d94d03ec/attachment.sig>

From jtomko at redhat.com  Thu Jul  7 12:29:45 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Thu, 7 Jul 2022 14:29:45 +0200
Subject: [PATCH 0/3] conf: Separate domain post parse code into
 domain_postparse.c
In-Reply-To: <cover.1657188411.git.mprivozn@redhat.com>
References: <cover.1657188411.git.mprivozn@redhat.com>
Message-ID: <YsbRuZQUbZA4OAql@mjch>

On a Thursday in 2022, Michal Privoznik wrote:
>*** BLURB HERE ***
>
>Michal Pr?vozn?k (3):
>  domain_conf: Unexport virDomainDefPostParseDeviceIteratorData
>  conf: Separate domain post parse code into domain_postparse.c
>  domain_postparse: Move error messages onto single line
>
> po/POTFILES                 |    1 +
> src/conf/domain_conf.c      | 1446 +---------------------------------
> src/conf/domain_conf.h      |   10 -
> src/conf/domain_postparse.c | 1466 +++++++++++++++++++++++++++++++++++
> src/conf/domain_postparse.h |   37 +
> src/conf/domain_validate.c  |   11 +-
> src/conf/meson.build        |    1 +
> src/libvirt_private.syms    |    5 +-
> src/libxl/xen_xl.c          |    1 +
> src/libxl/xen_xm.c          |    1 +
> src/lxc/lxc_native.c        |    1 +
> src/qemu/qemu_driver.c      |    1 +
> src/qemu/qemu_process.c     |    1 +
> src/vmx/vmx.c               |    1 +
> 14 files changed, 1525 insertions(+), 1458 deletions(-)
> create mode 100644 src/conf/domain_postparse.c
> create mode 100644 src/conf/domain_postparse.h
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/36be4e8b/attachment.sig>

From pkrempa at redhat.com  Thu Jul  7 13:10:34 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:34 +0200
Subject: [PATCH 00/11] Test case cleanups
Message-ID: <cover.1657199364.git.pkrempa@redhat.com>

These patches originate from my upcoming series bumping minimum qemu
version to 4.2 and are valid even without the qemu version bump.

Peter Krempa (11):
  test: domaincaps: Remove old test data
  qemuxml2(argv|xml)test: Drop qemu-3.1 version of
    'cpu-Icelake-Server-pconfig'
  qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv tests
  qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to
    VIR_TEST_CAPS_LATEST
  qemuxml2argvtest: Remove qemu-4.0 versions of cpu feature test cases
  qemuxml2argvtest: Convert 'net-user' case to _LATEST
  qemuxml2argvtest: Make 'qemu-ns' test case more stable
  qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the
    block setting fake host cpu
  qemu: Remove qemu-4.0 version of 'cpu-translation' test case
  qemucapabilitiestest: Fake proper version for 'caps_4.2.0.ppc64' case
  qemucapabilitiestest: Fake proper version for 'caps_4.2.0.aarch64'
    case

 .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 ---------------
 .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ----------------
 tests/domaincapsdata/qemu_2.11.0.s390x.xml    | 219 -----------------
 tests/domaincapsdata/qemu_2.11.0.x86_64.xml   | 191 ---------------
 .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 212 ----------------
 .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 222 -----------------
 .../qemu_2.12.0-virt.aarch64.xml              | 172 -------------
 tests/domaincapsdata/qemu_2.12.0.aarch64.xml  | 166 -------------
 tests/domaincapsdata/qemu_2.12.0.ppc64.xml    | 136 -----------
 tests/domaincapsdata/qemu_2.12.0.s390x.xml    | 219 -----------------
 tests/domaincapsdata/qemu_2.12.0.x86_64.xml   | 212 ----------------
 .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  | 208 ----------------
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  | 220 -----------------
 tests/domaincapsdata/qemu_3.0.0.ppc64.xml     | 138 -----------
 tests/domaincapsdata/qemu_3.0.0.s390x.xml     | 226 ------------------
 tests/domaincapsdata/qemu_3.0.0.x86_64.xml    | 208 ----------------
 .../caps_4.2.0.aarch64.replies                |   4 +-
 .../caps_4.2.0.aarch64.xml                    |   2 +-
 .../caps_4.2.0.ppc64.replies                  |   4 +-
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |   2 +-
 ...u-Icelake-Server-pconfig.x86_64-3.1.0.args |  33 ---
 tests/qemuxml2argvdata/cpu-eoi-disabled.args  |  31 ---
 ...gs => cpu-eoi-disabled.x86_64-latest.args} |  12 +-
 tests/qemuxml2argvdata/cpu-eoi-disabled.xml   |   2 +-
 tests/qemuxml2argvdata/cpu-eoi-enabled.args   |  31 ---
 ...rgs => cpu-eoi-enabled.x86_64-latest.args} |  13 +-
 tests/qemuxml2argvdata/cpu-eoi-enabled.xml    |   2 +-
 .../cpu-translation.x86_64-4.0.0.args         |  33 ---
 .../eoi-enabled.x86_64-4.0.0.args             |  32 ---
 .../hyperv-panic.x86_64-4.0.0.args            |  31 ---
 .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args |  31 ---
 .../kvmclock+eoi-disabled.x86_64-4.0.0.args   |  32 ---
 .../net-user.x86_64-4.0.0.args                |  35 ---
 ...4.0.0.args => net-user.x86_64-latest.args} |  18 +-
 .../pv-spinlock-disabled.x86_64-4.0.0.args    |  32 ---
 .../pv-spinlock-enabled.x86_64-4.0.0.args     |  32 ---
 tests/qemuxml2argvdata/qemu-ns.xml            |   1 -
 tests/qemuxml2argvtest.c                      |  24 +-
 ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml |  32 ---
 tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml |   2 +-
 tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml  |   2 +-
 .../qemu-ns.x86_64-latest.xml                 |   1 -
 tests/qemuxml2xmltest.c                       |   1 -
 43 files changed, 41 insertions(+), 3578 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0.x86_64.xml
 delete mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-eoi-disabled.args
 rename tests/qemuxml2argvdata/{hyperv-off.x86_64-4.0.0.args => cpu-eoi-disabled.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-eoi-enabled.args
 rename tests/qemuxml2argvdata/{eoi-disabled.x86_64-4.0.0.args => cpu-eoi-enabled.x86_64-latest.args} (60%)
 delete mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
 rename tests/qemuxml2argvdata/{qemu-ns.x86_64-4.0.0.args => net-user.x86_64-latest.args} (61%)
 delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml

-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:35 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:35 +0200
Subject: [PATCH 01/11] test: domaincaps: Remove old test data
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <a75212ee1b913067d3a0791a21edcafa2d19100b.1657199364.git.pkrempa@redhat.com>

Remove the test data for qemu-2.11, qemu-2.12 and qemu-3.0 which are no
longer supported.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 ---------------
 .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ----------------
 tests/domaincapsdata/qemu_2.11.0.s390x.xml    | 219 -----------------
 tests/domaincapsdata/qemu_2.11.0.x86_64.xml   | 191 ---------------
 .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml | 212 ----------------
 .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml | 222 -----------------
 .../qemu_2.12.0-virt.aarch64.xml              | 172 -------------
 tests/domaincapsdata/qemu_2.12.0.aarch64.xml  | 166 -------------
 tests/domaincapsdata/qemu_2.12.0.ppc64.xml    | 136 -----------
 tests/domaincapsdata/qemu_2.12.0.s390x.xml    | 219 -----------------
 tests/domaincapsdata/qemu_2.12.0.x86_64.xml   | 212 ----------------
 .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  | 208 ----------------
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  | 220 -----------------
 tests/domaincapsdata/qemu_3.0.0.ppc64.xml     | 138 -----------
 tests/domaincapsdata/qemu_3.0.0.s390x.xml     | 226 ------------------
 tests/domaincapsdata/qemu_3.0.0.x86_64.xml    | 208 ----------------
 16 files changed, 3144 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.11.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_2.12.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.0.0.x86_64.xml

diff --git a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
deleted file mode 100644
index ea9737d9ce..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0-q35.x86_64.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.11</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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>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='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-    </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</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client</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</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
deleted file mode 100644
index cccc6830f9..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.11</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='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>EPYC</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <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='ospke'/>
-      <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='rdrand'/>
-      <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'/>
-    </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='yes'>Westmere</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Client</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='yes'>Nehalem</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.s390x.xml b/tests/domaincapsdata/qemu_2.11.0.s390x.xml
deleted file mode 100644
index 804bf8020e..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0.s390x.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.11</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z14-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='yes'>qemu</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z990.3-base</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml b/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
deleted file mode 100644
index 3a8aa2ab71..0000000000
--- a/tests/domaincapsdata/qemu_2.11.0.x86_64.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.11</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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>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='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='invtsc'/>
-    </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</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='yes'>Skylake-Client</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</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='yes'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>EPYC</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='yes'>Broadwell</model>
-      <model usable='yes'>Broadwell-noTSX</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
deleted file mode 100644
index 0dc5995c09..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-q35.x86_64.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-2.12</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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Haswell-noTSX</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='require' name='abm'/>
-      <feature policy='require' name='invtsc'/>
-    </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</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</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</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='yes'>
-      <cbitpos>47</cbitpos>
-      <reducedPhysBits>1</reducedPhysBits>
-      <maxGuests>59</maxGuests>
-      <maxESGuests>450</maxESGuests>
-    </sev>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
deleted file mode 100644
index 575506d852..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-2.12</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='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>EPYC</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <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='ospke'/>
-      <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='rdrand'/>
-      <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'/>
-    </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='yes'>Westmere</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='no'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</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</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='no'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='no'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='yes'>
-      <cbitpos>47</cbitpos>
-      <reducedPhysBits>1</reducedPhysBits>
-      <maxGuests>59</maxGuests>
-      <maxESGuests>450</maxESGuests>
-    </sev>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
deleted file mode 100644
index 2074c89875..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0-virt.aarch64.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-aarch64</path>
-  <domain>kvm</domain>
-  <machine>virt-2.12</machine>
-  <arch>aarch64</arch>
-  <vcpu max='255'/>
-  <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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='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-m33</model>
-      <model usable='unknown'>arm926</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-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-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='yes'>
-      <enum name='version'>
-        <value>3</value>
-      </enum>
-    </gic>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml b/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
deleted file mode 100644
index a93313f980..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.aarch64.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='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-m33</model>
-      <model usable='unknown'>arm926</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-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-r5</model>
-      <model usable='unknown'>pxa270-a1</model>
-      <model usable='unknown'>pxa270</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml b/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
deleted file mode 100644
index cb3edcbd56..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.ppc64.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-2.12</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>POWER8</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <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>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</value>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>usb</value>
-        <value>pci</value>
-        <value>scsi</value>
-      </enum>
-      <enum name='capsType'/>
-      <enum name='pciBackend'>
-        <value>default</value>
-        <value>vfio</value>
-      </enum>
-    </hostdev>
-    <rng supported='yes'>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>random</value>
-        <value>egd</value>
-      </enum>
-    </rng>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.s390x.xml b/tests/domaincapsdata/qemu_2.12.0.s390x.xml
deleted file mode 100644
index 5c3d9ce7db..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.s390x.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-2.12</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z14-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='no'>qemu</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z990.3-base</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</value>
-      </enum>
-    </video>
-    <hostdev supported='yes'>
-      <enum name='mode'>
-        <value>subsystem</value>
-      </enum>
-      <enum name='startupPolicy'>
-        <value>default</value>
-        <value>mandatory</value>
-        <value>requisite</value>
-        <value>optional</value>
-      </enum>
-      <enum name='subsysType'>
-        <value>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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml b/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
deleted file mode 100644
index c8a5558536..0000000000
--- a/tests/domaincapsdata/qemu_2.12.0.x86_64.xml
+++ /dev/null
@@ -1,212 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-2.12</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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>Haswell-noTSX</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='require' name='abm'/>
-      <feature policy='require' name='invtsc'/>
-    </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</model>
-      <model usable='no'>Westmere-IBRS</model>
-      <model usable='no'>Skylake-Server</model>
-      <model usable='no'>Skylake-Server-IBRS</model>
-      <model usable='no'>Skylake-Client</model>
-      <model usable='no'>Skylake-Client-IBRS</model>
-      <model usable='yes'>SandyBridge</model>
-      <model usable='no'>SandyBridge-IBRS</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</model>
-      <model usable='no'>Nehalem-IBRS</model>
-      <model usable='yes'>IvyBridge</model>
-      <model usable='no'>IvyBridge-IBRS</model>
-      <model usable='no'>Haswell</model>
-      <model usable='yes'>Haswell-noTSX</model>
-      <model usable='no'>Haswell-noTSX-IBRS</model>
-      <model usable='no'>Haswell-IBRS</model>
-      <model usable='no'>EPYC</model>
-      <model usable='no'>EPYC-IBPB</model>
-      <model usable='yes'>Conroe</model>
-      <model usable='no'>Broadwell</model>
-      <model usable='no'>Broadwell-noTSX</model>
-      <model usable='no'>Broadwell-noTSX-IBRS</model>
-      <model usable='no'>Broadwell-IBRS</model>
-      <model usable='yes'>486</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='yes'>
-      <cbitpos>47</cbitpos>
-      <reducedPhysBits>1</reducedPhysBits>
-      <maxGuests>59</maxGuests>
-      <maxESGuests>450</maxESGuests>
-    </sev>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
deleted file mode 100644
index 4f80439eb4..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0-q35.x86_64.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-q35-3.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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>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='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='topoext'/>
-      <feature policy='require' name='invtsc'/>
-    </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='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='yes'>Conroe</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>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
deleted file mode 100644
index 301101095c..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>qemu</domain>
-  <machine>pc-i440fx-3.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='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>EPYC</model>
-      <vendor>AMD</vendor>
-      <feature policy='require' name='acpi'/>
-      <feature policy='require' name='ss'/>
-      <feature policy='require' name='monitor'/>
-      <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='require' name='npt'/>
-      <feature policy='disable' name='vme'/>
-      <feature policy='disable' name='fma'/>
-      <feature policy='disable' name='avx'/>
-      <feature policy='disable' name='f16c'/>
-      <feature policy='disable' name='rdrand'/>
-      <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'>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='yes'>Conroe</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>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml b/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
deleted file mode 100644
index 8605db5cc8..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.ppc64.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-ppc64</path>
-  <domain>kvm</domain>
-  <machine>pseries-3.0</machine>
-  <arch>ppc64</arch>
-  <vcpu max='1024'/>
-  <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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='allow'>POWER8</model>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='unknown'>POWER9</model>
-      <model usable='unknown'>POWER8</model>
-      <model usable='unknown'>POWER7</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <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>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>vga</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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.s390x.xml b/tests/domaincapsdata/qemu_3.0.0.s390x.xml
deleted file mode 100644
index f49b6907ff..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.s390x.xml
+++ /dev/null
@@ -1,226 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-s390x</path>
-  <domain>kvm</domain>
-  <machine>s390-ccw-virtio-3.0</machine>
-  <arch>s390x</arch>
-  <vcpu max='248'/>
-  <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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='no'/>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>z14-base</model>
-      <feature policy='require' name='aen'/>
-      <feature policy='require' name='cmmnt'/>
-      <feature policy='require' name='aefsi'/>
-      <feature policy='require' name='mepoch'/>
-      <feature policy='require' name='msa8'/>
-      <feature policy='require' name='msa7'/>
-      <feature policy='require' name='msa6'/>
-      <feature policy='require' name='msa5'/>
-      <feature policy='require' name='msa4'/>
-      <feature policy='require' name='msa3'/>
-      <feature policy='require' name='msa2'/>
-      <feature policy='require' name='msa1'/>
-      <feature policy='require' name='sthyi'/>
-      <feature policy='require' name='edat'/>
-      <feature policy='require' name='ri'/>
-      <feature policy='require' name='edat2'/>
-      <feature policy='require' name='vx'/>
-      <feature policy='require' name='ipter'/>
-      <feature policy='require' name='mepochptff'/>
-      <feature policy='require' name='vxeh'/>
-      <feature policy='require' name='vxpd'/>
-      <feature policy='require' name='esop'/>
-      <feature policy='require' name='iep'/>
-      <feature policy='require' name='cte'/>
-      <feature policy='require' name='bpb'/>
-      <feature policy='require' name='gs'/>
-      <feature policy='require' name='ppa15'/>
-      <feature policy='require' name='zpci'/>
-      <feature policy='require' name='sea_esop2'/>
-      <feature policy='require' name='te'/>
-      <feature policy='require' name='cmm'/>
-    </mode>
-    <mode name='custom' supported='yes'>
-      <model usable='yes'>z890.2</model>
-      <model usable='yes'>z990.4</model>
-      <model usable='yes'>z14ZR1</model>
-      <model usable='yes'>z10BC.2</model>
-      <model usable='yes'>z196.2</model>
-      <model usable='yes'>z14</model>
-      <model usable='yes'>z9BC-base</model>
-      <model usable='yes'>zEC12-base</model>
-      <model usable='yes'>z196-base</model>
-      <model usable='yes'>z13-base</model>
-      <model usable='yes'>z990.3</model>
-      <model usable='yes'>z9EC</model>
-      <model usable='yes'>zBC12</model>
-      <model usable='yes'>z9EC.3</model>
-      <model usable='yes'>z196.2-base</model>
-      <model usable='no'>qemu</model>
-      <model usable='yes'>zEC12.2-base</model>
-      <model usable='yes'>z800-base</model>
-      <model usable='yes'>z9EC.2</model>
-      <model usable='yes'>z900.2-base</model>
-      <model usable='yes'>z14ZR1-base</model>
-      <model usable='yes'>z900.3</model>
-      <model usable='yes'>z890-base</model>
-      <model usable='yes'>z890</model>
-      <model usable='yes'>z990.4-base</model>
-      <model usable='yes'>z10BC.2-base</model>
-      <model usable='yes'>z900.2</model>
-      <model usable='yes'>z9BC.2-base</model>
-      <model usable='yes'>z800</model>
-      <model usable='yes'>z114</model>
-      <model usable='yes'>z13</model>
-      <model usable='yes'>z13s-base</model>
-      <model usable='yes'>z990</model>
-      <model usable='yes'>z990.2</model>
-      <model usable='yes'>z14-base</model>
-      <model usable='yes'>z890.2-base</model>
-      <model usable='yes'>z196</model>
-      <model usable='yes'>z10EC</model>
-      <model usable='yes'>z13s</model>
-      <model usable='yes'>z900</model>
-      <model usable='yes'>z10EC.3</model>
-      <model usable='yes'>z10EC.2-base</model>
-      <model usable='yes'>z114-base</model>
-      <model usable='yes'>z990.2-base</model>
-      <model usable='yes'>z9EC.2-base</model>
-      <model usable='yes'>z890.3</model>
-      <model usable='yes'>z900.3-base</model>
-      <model usable='yes'>z9BC.2</model>
-      <model usable='yes'>z10BC</model>
-      <model usable='yes'>z990.5</model>
-      <model usable='yes'>zEC12.2</model>
-      <model usable='yes'>z10EC-base</model>
-      <model usable='yes'>z9EC-base</model>
-      <model usable='yes'>z9EC.3-base</model>
-      <model usable='yes'>zEC12</model>
-      <model usable='yes'>z990.5-base</model>
-      <model usable='yes'>z10BC-base</model>
-      <model usable='yes'>z900-base</model>
-      <model usable='yes'>z13.2</model>
-      <model usable='yes'>zBC12-base</model>
-      <model usable='yes'>z13.2-base</model>
-      <model usable='yes'>z890.3-base</model>
-      <model usable='yes'>z990-base</model>
-      <model usable='yes'>z10EC.2</model>
-      <model usable='yes'>z9BC</model>
-      <model usable='yes'>z10EC.3-base</model>
-      <model usable='yes'>z990.3-base</model>
-    </mode>
-  </cpu>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>egl-headless</value>
-      </enum>
-    </graphics>
-    <video supported='yes'>
-      <enum name='modelType'>
-        <value>virtio</value>
-        <value>none</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>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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='no'/>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='no'/>
-    <genid supported='no'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <s390-pv supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml b/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
deleted file mode 100644
index 650728566e..0000000000
--- a/tests/domaincapsdata/qemu_3.0.0.x86_64.xml
+++ /dev/null
@@ -1,208 +0,0 @@
-<domainCapabilities>
-  <path>/usr/bin/qemu-system-x86_64</path>
-  <domain>kvm</domain>
-  <machine>pc-i440fx-3.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'>
-      <enum name='hostPassthroughMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='maximum' supported='yes'>
-      <enum name='maximumMigratable'>
-        <value>on</value>
-        <value>off</value>
-      </enum>
-    </mode>
-    <mode name='host-model' supported='yes'>
-      <model fallback='forbid'>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='xsaves'/>
-      <feature policy='require' name='pdpe1gb'/>
-      <feature policy='require' name='topoext'/>
-      <feature policy='require' name='invtsc'/>
-    </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='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='yes'>Conroe</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>
-  <memoryBacking supported='yes'>
-    <enum name='sourceType'>
-      <value>file</value>
-      <value>anonymous</value>
-      <value>memfd</value>
-    </enum>
-  </memoryBacking>
-  <devices>
-    <disk supported='yes'>
-      <enum name='diskDevice'>
-        <value>disk</value>
-        <value>cdrom</value>
-        <value>floppy</value>
-        <value>lun</value>
-      </enum>
-      <enum name='bus'>
-        <value>ide</value>
-        <value>fdc</value>
-        <value>scsi</value>
-        <value>virtio</value>
-        <value>usb</value>
-        <value>sata</value>
-      </enum>
-      <enum name='model'>
-        <value>virtio</value>
-        <value>virtio-transitional</value>
-        <value>virtio-non-transitional</value>
-      </enum>
-    </disk>
-    <graphics supported='yes'>
-      <enum name='type'>
-        <value>sdl</value>
-        <value>vnc</value>
-        <value>spice</value>
-        <value>egl-headless</value>
-      </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>
-    <filesystem supported='yes'>
-      <enum name='driverType'>
-        <value>path</value>
-        <value>handle</value>
-      </enum>
-    </filesystem>
-    <tpm supported='yes'>
-      <enum name='model'>
-        <value>tpm-tis</value>
-        <value>tpm-crb</value>
-      </enum>
-      <enum name='backendModel'>
-        <value>passthrough</value>
-        <value>emulator</value>
-      </enum>
-    </tpm>
-  </devices>
-  <features>
-    <gic supported='no'/>
-    <vmcoreinfo supported='yes'/>
-    <genid supported='yes'/>
-    <backingStoreInput supported='no'/>
-    <backup supported='no'/>
-    <sev supported='no'/>
-  </features>
-</domainCapabilities>
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:36 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:36 +0200
Subject: [PATCH 02/11] qemuxml2(argv|xml)test: Drop qemu-3.1 version of
 'cpu-Icelake-Server-pconfig'
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <25b02a1cc27b238d9a30a74cbfe3c044cf2ead32.1657199364.git.pkrempa@redhat.com>

Prior to qemu-3.2 we'd have to disable the 'pconfig' feature explicitly
which is no longer needed with new qemu. Remove the version locked to
qemu-3.1 as the 'latest' case sufficiently handles what we want to test.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ...u-Icelake-Server-pconfig.x86_64-3.1.0.args | 33 -------------------
 tests/qemuxml2argvtest.c                      |  1 -
 ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml | 32 ------------------
 tests/qemuxml2xmltest.c                       |  1 -
 4 files changed, 67 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml

diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
deleted file mode 100644
index 5c9a0fd9d2..0000000000
--- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-test \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-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-i440fx-3.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu Icelake-Server,pconfig=off,intel-pt=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=on,wait=off \
--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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4ca1131377..3cbb428ee1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3424,7 +3424,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("vhost-user-vga");
     DO_TEST_CAPS_LATEST("vhost-user-gpu-secondary");

-    DO_TEST_CAPS_VER("cpu-Icelake-Server-pconfig", "3.1.0");
     DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig");

     DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2", "aarch64");
diff --git a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml b/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
deleted file mode 100644
index 0a2d113339..0000000000
--- a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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-i440fx-3.1'>hvm</type>
-    <boot dev='network'/>
-  </os>
-  <cpu mode='custom' match='exact' check='none'>
-    <model fallback='forbid'>Icelake-Server</model>
-    <feature policy='disable' name='pconfig'/>
-  </cpu>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <controller type='usb' index='0' model='piix3-uhci'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-    </memballoon>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 60114e3673..71bce98c17 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1353,7 +1353,6 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-graphics", "x86_64");
     DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-graphics", "x86_64");

-    DO_TEST_CAPS_VER("cpu-Icelake-Server-pconfig", "3.1.0");
     DO_TEST_CAPS_LATEST("cpu-Icelake-Server-pconfig");

     DO_TEST_CAPS_ARCH_LATEST("aarch64-default-cpu-kvm-virt-4.2", "aarch64");
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:38 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:38 +0200
Subject: [PATCH 04/11] qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)'
 cases to VIR_TEST_CAPS_LATEST
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <1e3fa25d71067fb8f043133a65733a9a9a00553a.1657199364.git.pkrempa@redhat.com>

The tested feature doesn't change across versions so we can use the
modern testing infrastructure.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ...ed.args => cpu-eoi-disabled.x86_64-latest.args} | 14 ++++++++------
 tests/qemuxml2argvdata/cpu-eoi-disabled.xml        |  2 +-
 ...led.args => cpu-eoi-enabled.x86_64-latest.args} | 14 ++++++++------
 tests/qemuxml2argvdata/cpu-eoi-enabled.xml         |  2 +-
 tests/qemuxml2argvtest.c                           |  6 ++++--
 tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml      |  2 +-
 tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml       |  2 +-
 7 files changed, 24 insertions(+), 18 deletions(-)
 rename tests/qemuxml2argvdata/{cpu-eoi-disabled.args => cpu-eoi-disabled.x86_64-latest.args} (53%)
 rename tests/qemuxml2argvdata/{cpu-eoi-enabled.args => cpu-eoi-enabled.x86_64-latest.args} (53%)

diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
similarity index 53%
rename from tests/qemuxml2argvdata/cpu-eoi-disabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
index b252446464..dfb4a53bfd 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.x86_64-latest.args
@@ -6,15 +6,15 @@ 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 \
+/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,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu32,kvm-pv-eoi=off \
 -m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
index 657de0482a..c93e75e3e5 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
similarity index 53%
rename from tests/qemuxml2argvdata/cpu-eoi-enabled.args
rename to tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
index 849593269d..155d5ecef7 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.x86_64-latest.args
@@ -6,15 +6,15 @@ 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 \
+/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,usb=off,dump-guest-core=off \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu32,kvm-pv-eoi=on \
 -m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 -overcommit mem-lock=off \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
@@ -26,6 +26,8 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--usb \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
index bc8934f260..1c24398f42 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <controller type='usb' index='0'/>
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index bdfb47f0e5..17d7ee9ab0 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1247,8 +1247,6 @@ mymain(void)

     DO_TEST_CAPS_LATEST("controller-usb-order");

-    DO_TEST_NOCAPS("cpu-eoi-disabled");
-    DO_TEST_NOCAPS("cpu-eoi-enabled");
     DO_TEST("controller-order",
             QEMU_CAPS_KVM,
             QEMU_CAPS_PIIX3_USB_UHCI,
@@ -1258,6 +1256,10 @@ mymain(void)
             QEMU_CAPS_USB_HUB,
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
+    /* 'eoi' cpu feature with an explicit CPU defined */
+    DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
+    DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
+    /* 'eoi' cpu feature without an explicit CPU defined */
     DO_TEST_CAPS_VER("eoi-disabled", "4.0.0");
     DO_TEST_CAPS_LATEST("eoi-disabled");
     DO_TEST_CAPS_VER("eoi-enabled", "4.0.0");
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index 7ae2c7034b..acd17da598 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <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>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index bee4fd0240..49900aea9a 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -21,7 +21,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <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>
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:37 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:37 +0200
Subject: [PATCH 03/11] qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv
 tests
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <325488ccc93eeb5af06360b044bd546509e8a701.1657199364.git.pkrempa@redhat.com>

The version-locked version of the test data is identical to the 'latest'
version so we can remove them.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../hyperv-off.x86_64-4.0.0.args              | 31 -------------------
 .../hyperv-panic.x86_64-4.0.0.args            | 31 -------------------
 .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 31 -------------------
 tests/qemuxml2argvtest.c                      |  3 --
 4 files changed, 96 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args

diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
deleted file mode 100644
index be484daf84..0000000000
--- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device 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/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
deleted file mode 100644
index 512f59169c..0000000000
--- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,hv-crash \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
deleted file mode 100644
index 1efbc95985..0000000000
--- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu 'qemu64,hv-relaxed=on,hv-vapic=on,hv-spinlocks=0x2fff,hv-vpindex=on,hv-runtime=on,hv-synic=on,hv-stimer=on,hv-reset=on,hv-vendor-id=KVM Hv,hv-frequencies=on,hv-reenlightenment=on,hv-tlbflush=on,hv-ipi=on,hv-evmcs=on' \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.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 3cbb428ee1..bdfb47f0e5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1269,11 +1269,8 @@ mymain(void)
     DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "4.0.0");
     DO_TEST_CAPS_LATEST("kvmclock+eoi-disabled");

-    DO_TEST_CAPS_VER("hyperv", "4.0.0");
     DO_TEST_CAPS_LATEST("hyperv");
-    DO_TEST_CAPS_VER("hyperv-off", "4.0.0");
     DO_TEST_CAPS_LATEST("hyperv-off");
-    DO_TEST_CAPS_VER("hyperv-panic", "4.0.0");
     DO_TEST_CAPS_LATEST("hyperv-panic");
     DO_TEST_CAPS_VER("hyperv-passthrough", "6.1.0");
     DO_TEST_CAPS_LATEST("hyperv-passthrough");
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:39 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:39 +0200
Subject: [PATCH 05/11] qemuxml2argvtest: Remove qemu-4.0 versions of cpu
 feature test cases
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <f29654ee64994af795cbb643eb356958f51e0cd8.1657199364.git.pkrempa@redhat.com>

The cpu feature formatting doesn't change between the versions thus we
can just keep the '-latest' versions.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../eoi-disabled.x86_64-4.0.0.args            | 32 -------------------
 .../eoi-enabled.x86_64-4.0.0.args             | 32 -------------------
 .../kvmclock+eoi-disabled.x86_64-4.0.0.args   | 32 -------------------
 .../pv-spinlock-disabled.x86_64-4.0.0.args    | 32 -------------------
 .../pv-spinlock-enabled.x86_64-4.0.0.args     | 32 -------------------
 tests/qemuxml2argvtest.c                      |  5 ---
 6 files changed, 165 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args

diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
deleted file mode 100644
index 14080eabed..0000000000
--- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-eoi=off \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device 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/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
deleted file mode 100644
index f7ad06a1b5..0000000000
--- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-eoi=on \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device 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/kvmclock+eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
deleted file mode 100644
index d1c15c4202..0000000000
--- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvmclock=off,kvm-pv-eoi=off \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device 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/pv-spinlock-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
deleted file mode 100644
index f7055f4e38..0000000000
--- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-unhalt=off \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device 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/pv-spinlock-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
deleted file mode 100644
index ffb233f21c..0000000000
--- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
+++ /dev/null
@@ -1,32 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu qemu64,kvm-pv-unhalt=on \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--boot strict=on \
--device 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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 17d7ee9ab0..71ea3b4e0d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1260,15 +1260,10 @@ mymain(void)
     DO_TEST_CAPS_LATEST("cpu-eoi-disabled");
     DO_TEST_CAPS_LATEST("cpu-eoi-enabled");
     /* 'eoi' cpu feature without an explicit CPU defined */
-    DO_TEST_CAPS_VER("eoi-disabled", "4.0.0");
     DO_TEST_CAPS_LATEST("eoi-disabled");
-    DO_TEST_CAPS_VER("eoi-enabled", "4.0.0");
     DO_TEST_CAPS_LATEST("eoi-enabled");
-    DO_TEST_CAPS_VER("pv-spinlock-disabled", "4.0.0");
     DO_TEST_CAPS_LATEST("pv-spinlock-disabled");
-    DO_TEST_CAPS_VER("pv-spinlock-enabled", "4.0.0");
     DO_TEST_CAPS_LATEST("pv-spinlock-enabled");
-    DO_TEST_CAPS_VER("kvmclock+eoi-disabled", "4.0.0");
     DO_TEST_CAPS_LATEST("kvmclock+eoi-disabled");

     DO_TEST_CAPS_LATEST("hyperv");
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:41 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:41 +0200
Subject: [PATCH 07/11] qemuxml2argvtest: Make 'qemu-ns' test case more stable
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <57aecf11e5f6a518abfe66a508a2b361b69dda58.1657199364.git.pkrempa@redhat.com>

The test was showing that the 'blockdev' capability is properly added
despite although we didn't detect it yet. Unfortunately this test
can't be carried over once we bump minimum qemu version to qemu-4.2.

Make the test case future-proof by removing the qemu-4.0.0 version which
would become pointless and use only already deprecated capability flags
so that the test output does not change.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../qemu-ns.x86_64-4.0.0.args                 | 38 -------------------
 tests/qemuxml2argvdata/qemu-ns.xml            |  1 -
 tests/qemuxml2argvtest.c                      |  1 -
 .../qemu-ns.x86_64-latest.xml                 |  1 -
 4 files changed, 41 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args

diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
deleted file mode 100644
index 284f32d6a1..0000000000
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
+++ /dev/null
@@ -1,38 +0,0 @@
-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 \
-NS=ns \
-BAR='' \
-/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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--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":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ua-disk,bootindex=1,prop1=propval1,prop2=-321,prop3=123,prop4=on,prop5=off \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--unknown parameter \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxml2argvdata/qemu-ns.xml
index 36bf582dec..dc98421226 100644
--- a/tests/qemuxml2argvdata/qemu-ns.xml
+++ b/tests/qemuxml2argvdata/qemu-ns.xml
@@ -30,7 +30,6 @@
   </qemu:commandline>
   <qemu:capabilities>
     <qemu:add capability="vnc-colon"/>
-    <qemu:add capability="blockdev"/>
     <qemu:del capability="name"/>
   </qemu:capabilities>
   <qemu:override>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 324475475e..e14ed8b882 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2036,7 +2036,6 @@ mymain(void)
                  QEMU_CAPS_LAST,
                  ARG_END);

-    DO_TEST_CAPS_VER("qemu-ns", "4.0.0");
     DO_TEST_CAPS_LATEST("qemu-ns");
     DO_TEST_NOCAPS("qemu-ns-no-env");
     DO_TEST_NOCAPS("qemu-ns-alt");
diff --git a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
index a8998ae582..b788038f29 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
@@ -46,7 +46,6 @@
   </qemu:commandline>
   <qemu:capabilities>
     <qemu:add capability='vnc-colon'/>
-    <qemu:add capability='blockdev'/>
     <qemu:del capability='name'/>
   </qemu:capabilities>
   <qemu:override>
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:43 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:43 +0200
Subject: [PATCH 09/11] qemu: Remove qemu-4.0 version of 'cpu-translation' test
 case
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <a5358adc4707fd669e324125220cdccc385f4a15.1657199364.git.pkrempa@redhat.com>

The cpu commandline is identical with the '-latest' version so there's
no need for a separate case.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../cpu-translation.x86_64-4.0.0.args         | 33 -------------------
 tests/qemuxml2argvtest.c                      |  1 -
 2 files changed, 34 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args

diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
deleted file mode 100644
index 09141106d5..0000000000
--- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu Haswell,pclmulqdq=on,ds-cpl=on,tsc-adjust=on,fxsr-opt=on,lahf-lm=on,cmp-legacy=on,nodeid-msr=on,perfctr-core=on,perfctr-nb=on,kvm-pv-eoi=on,kvm-pv-unhalt=on \
--m 214 \
--overcommit mem-lock=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=on,wait=off \
--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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 74a1baa018..a99b44bf2d 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2125,7 +2125,6 @@ mymain(void)

     DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
     DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
-    DO_TEST_CAPS_VER("cpu-translation", "4.0.0");
     DO_TEST_CAPS_LATEST("cpu-translation");

     DO_TEST_NOCAPS("memtune");
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:44 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:44 +0200
Subject: [PATCH 10/11] qemucapabilitiestest: Fake proper version for
 'caps_4.2.0.ppc64' case
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <088d878bf0c6f53ef78f5079b3df05220c774486.1657199364.git.pkrempa@redhat.com>

The capabilities for that version were not updated from the development
version and thus would fail our upcoming minimum version change. Fake
the data to report 4.2.0.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies | 4 ++--
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index d0b21ef123..4ed901c3de 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -17,8 +17,8 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
-      "minor": 1,
+      "micro": 0,
+      "minor": 2,
       "major": 4
     },
     "package": "v4.1.0-2198-g9e583f2"
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 1586f28ca5..7c5275210b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -159,7 +159,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
-  <version>4001050</version>
+  <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900242</microcodeVersion>
   <package>v4.1.0-2198-g9e583f2</package>
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:45 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:45 +0200
Subject: [PATCH 11/11] qemucapabilitiestest: Fake proper version for
 'caps_4.2.0.aarch64' case
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <062158914f83d27de34002893912373c528729c0.1657199364.git.pkrempa@redhat.com>

The capabilities for that version were not updated from the development
version and thus would fail our upcoming minimum version change. Fake
the data to report 4.2.0.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies | 4 ++--
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index bd4a6bf41e..5321348322 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -17,8 +17,8 @@
 {
   "return": {
     "qemu": {
-      "micro": 50,
-      "minor": 1,
+      "micro": 0,
+      "minor": 2,
       "major": 4
     },
     "package": "v4.1.0-2221-g36609b4fa3"
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 833bf955f9..162ace7b2b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -162,7 +162,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
-  <version>4001050</version>
+  <version>4002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
   <package>v4.1.0-2221-g36609b4fa3</package>
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:40 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:40 +0200
Subject: [PATCH 06/11] qemuxml2argvtest: Convert 'net-user' case to _LATEST
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <e80c2a626612feb9ef194e5796c23043261ac6ab.1657199364.git.pkrempa@redhat.com>

The tested net device has the same syntax with latest qemu so there's no
need to have a version-locked test for it.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../net-user.x86_64-4.0.0.args                | 35 -----------------
 .../net-user.x86_64-latest.args               | 38 +++++++++++++++++++
 tests/qemuxml2argvtest.c                      |  2 +-
 3 files changed, 39 insertions(+), 36 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
 create mode 100644 tests/qemuxml2argvdata/net-user.x86_64-latest.args

diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
deleted file mode 100644
index 2389919eb7..0000000000
--- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
+++ /dev/null
@@ -1,35 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--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 \
--netdev user,id=hostnet0 \
--device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user.x86_64-latest.args b/tests/qemuxml2argvdata/net-user.x86_64-latest.args
new file mode 100644
index 0000000000..87423d4cad
--- /dev/null
+++ b/tests/qemuxml2argvdata/net-user.x86_64-latest.args
@@ -0,0 +1,38 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-netdev user,id=hostnet0 \
+-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"00:11:22:33:44:55","bus":"pci.0","addr":"0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 71ea3b4e0d..324475475e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1592,7 +1592,7 @@ mymain(void)
     DO_TEST_NOCAPS("net-vhostuser-multiq");
     DO_TEST_FAILURE_NOCAPS("net-vhostuser-fail");
     DO_TEST_NOCAPS("net-user");
-    DO_TEST_CAPS_ARCH_VER_FULL("net-user", "x86_64", "4.0.0", ARG_FLAGS, FLAG_SLIRP_HELPER);
+    DO_TEST_CAPS_ARCH_LATEST_FULL("net-user", "x86_64", ARG_FLAGS, FLAG_SLIRP_HELPER);
     DO_TEST_NOCAPS("net-user-addr");
     DO_TEST_NOCAPS("net-virtio");
     DO_TEST("net-virtio-device",
-- 
2.36.1


From pkrempa at redhat.com  Thu Jul  7 13:10:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu,  7 Jul 2022 15:10:42 +0200
Subject: [PATCH 08/11] qemuxml2argvtest: Move real-caps versions of cpu-host
 tests out of the block setting fake host cpu
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <3aaca2b4ba1ebed0d29fbdee3fbe48955aca09b9.1657199364.git.pkrempa@redhat.com>

Make it obvious that the fake cpu does not apply to the test cases based
on real capabilities.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuxml2argvtest.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e14ed8b882..74a1baa018 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2120,12 +2120,13 @@ mymain(void)
     DO_TEST("cpu-Haswell3", QEMU_CAPS_KVM);
     DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
     DO_TEST_NOCAPS("cpu-host-model-cmt");
-    DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
     DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
+    qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
+
+    DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
     DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
     DO_TEST_CAPS_VER("cpu-translation", "4.0.0");
     DO_TEST_CAPS_LATEST("cpu-translation");
-    qemuTestSetHostCPU(&driver, driver.hostarch, NULL);

     DO_TEST_NOCAPS("memtune");
     DO_TEST_NOCAPS("memtune-unlimited");
-- 
2.36.1


From jtomko at redhat.com  Thu Jul  7 13:55:46 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Thu, 7 Jul 2022 15:55:46 +0200
Subject: [PATCH 07/11] qemuxml2argvtest: Make 'qemu-ns' test case more
 stable
In-Reply-To: <57aecf11e5f6a518abfe66a508a2b361b69dda58.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
 <57aecf11e5f6a518abfe66a508a2b361b69dda58.1657199364.git.pkrempa@redhat.com>
Message-ID: <Ysbl4pdVFAFALlw9@mjch>

On a Thursday in 2022, Peter Krempa wrote:
>The test was showing that the 'blockdev' capability is properly added
>despite although we didn't detect it yet. Unfortunately this test

d/despite /
   or
d/although /

Jano

>can't be carried over once we bump minimum qemu version to qemu-4.2.
>
>Make the test case future-proof by removing the qemu-4.0.0 version which
>would become pointless and use only already deprecated capability flags
>so that the test output does not change.
>
>Signed-off-by: Peter Krempa <pkrempa at redhat.com>
>---
> .../qemu-ns.x86_64-4.0.0.args                 | 38 -------------------
> tests/qemuxml2argvdata/qemu-ns.xml            |  1 -
> tests/qemuxml2argvtest.c                      |  1 -
> .../qemu-ns.x86_64-latest.xml                 |  1 -
> 4 files changed, 41 deletions(-)
> delete mode 100644 tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/0ade7357/attachment.sig>

From jtomko at redhat.com  Thu Jul  7 13:57:26 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Thu, 7 Jul 2022 15:57:26 +0200
Subject: [PATCH 00/11] Test case cleanups
In-Reply-To: <cover.1657199364.git.pkrempa@redhat.com>
References: <cover.1657199364.git.pkrempa@redhat.com>
Message-ID: <YsbmRpCYJfbwEROb@mjch>

On a Thursday in 2022, Peter Krempa wrote:
>These patches originate from my upcoming series bumping minimum qemu
>version to 4.2 and are valid even without the qemu version bump.
>
>Peter Krempa (11):
>  test: domaincaps: Remove old test data
>  qemuxml2(argv|xml)test: Drop qemu-3.1 version of
>    'cpu-Icelake-Server-pconfig'
>  qemuxml2argvtest: Drop 'qemu-4.1' versions of hyperv tests
>  qemuxml2argvtest: Convert 'cpu-eoi-(disabled|enabled)' cases to
>    VIR_TEST_CAPS_LATEST
>  qemuxml2argvtest: Remove qemu-4.0 versions of cpu feature test cases
>  qemuxml2argvtest: Convert 'net-user' case to _LATEST
>  qemuxml2argvtest: Make 'qemu-ns' test case more stable
>  qemuxml2argvtest: Move real-caps versions of cpu-host tests out of the
>    block setting fake host cpu
>  qemu: Remove qemu-4.0 version of 'cpu-translation' test case
>  qemucapabilitiestest: Fake proper version for 'caps_4.2.0.ppc64' case
>  qemucapabilitiestest: Fake proper version for 'caps_4.2.0.aarch64'
>    case
>
> .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml | 191 ---------------
> .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml | 204 ----------------

[...]

> .../qemu-ns.x86_64-latest.xml                 |   1 -
> tests/qemuxml2xmltest.c                       |   1 -
> 43 files changed, 41 insertions(+), 3578 deletions(-)

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/cc055981/attachment-0001.sig>

From mkletzan at redhat.com  Thu Jul  7 14:26:08 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 7 Jul 2022 16:26:08 +0200
Subject: [PATCH RFC v2 3/3] qemu_driver: use qemuMonitorQueryStats to
 extract halt poll time
In-Reply-To: <20220705232628.1779286-4-natto@weirdnatto.in>
References: <20220705232628.1779286-1-natto@weirdnatto.in>
 <20220705232628.1779286-4-natto@weirdnatto.in>
Message-ID: <YsbtAIiPRPX10o8i@wheatley>

On Wed, Jul 06, 2022 at 04:56:28AM +0530, Amneesh Singh wrote:
>Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
>This patch uses qemuMonitorQueryStats to query "halt_poll_success_ns"
>and "halt_poll_fail_ns" for every vCPU. The respective values for each
>vCPU are then added together.
>
>Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>---
> src/qemu/qemu_driver.c | 70 +++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 62 insertions(+), 8 deletions(-)
>
>diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
>index 97c6ed95..30170d5c 100644
>--- a/src/qemu/qemu_driver.c
>+++ b/src/qemu/qemu_driver.c
>@@ -18052,15 +18052,69 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom,
> }
>
> static int
>-qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom,
>-                                  virTypedParamList *params)
>+qemuDomainGetStatsCpuHaltPollTime(virQEMUDriver *driver,
>+                                  virDomainObj *dom,
>+                                  virTypedParamList *params,
>+                                  unsigned int privflags)
> {
>     unsigned long long haltPollSuccess = 0;
>     unsigned long long haltPollFail = 0;
>-    pid_t pid = dom->pid;
>+    qemuDomainObjPrivate *priv = dom->privateData;
>+    bool queryStatsCap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_STATS);
>
>-    if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
>-        return 0;
>+    if (queryStatsCap && HAVE_JOB(privflags) && virDomainObjIsActive(dom) && driver->privileged) {

Why is there a check for whether the driver is privileged?  I thought
this can also work with a session mode.

>+        size_t i;
>+        qemuMonitorQueryStatsTargetType target = QEMU_MONITOR_QUERY_STATS_TARGET_VCPU;
>+        qemuMonitorQueryStatsProvider *provider = NULL;
>+        g_autoptr(GPtrArray) providers = NULL;
>+        g_autoptr(GPtrArray) queried_stats = NULL;
>+        provider = qemuMonitorQueryStatsProviderNew(
>+            target,
>+            QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
>+            QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS,
>+            QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS,
>+            -1);
>+
>+        if (!provider)
>+            return 0;

In this case you can still do the callback.  Basically don't put it in
an "else" branch, just get a new condition checking if the stats were
gathered or not (if need be you can get a new variable for that).

>+
>+        providers = g_ptr_array_new_full(1, (GDestroyNotify) qemuMonitorQueryStatsProviderFree);
>+        g_ptr_array_add(providers, provider);
>+
>+        qemuDomainObjEnterMonitor(driver, dom);
>+        queried_stats = qemuMonitorQueryStats(priv->mon, target, NULL, providers);
>+        qemuDomainObjExitMonitor(dom);
>+
>+        if (!queried_stats)
>+            return 0;
>+
>+        for (i = 0; i < queried_stats->len; i++) {
>+            unsigned long long curHaltPollSuccess, curHaltPollFail;
>+            GHashTable *cur_table = queried_stats->pdata[i];
>+            virJSONValue *success_obj, *fail_obj;
>+            const char *success_str = qemuMonitorQueryStatsVcpuNameTypeToString(
>+                QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_SUCCESS_NS);
>+            const char *fail_str = qemuMonitorQueryStatsVcpuNameTypeToString(
>+                QEMU_MONITOR_QUERY_STATS_VCPU_NAME_HALT_POLL_FAIL_NS);
>+
>+            success_obj = g_hash_table_lookup(cur_table, success_str);
>+            fail_obj = g_hash_table_lookup(cur_table, fail_str);
>+

If you want it could be nicer to have an extra function for this since
it looks like it'll be repeated.  Also have a look if the enums can't be
defined elsewhere/differently so that you can end up with something like
this:

virJSONValue *success_obj = qemuStatsGet(QEMU_STATS_NAME_HALT_POLL_SUCCESS_NS);

>+            if (!(success_obj && fail_obj))
>+                return 0;
>+

This checks if they both exist (although I would prefer (!success_obj ||
!fail_obj) as it is more readable and for me it is similar to how I
would say that in a sentence) but does not check that they really are a
number.

>+            ignore_value(virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess));
>+            ignore_value(virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail));
>+

That's why you should also check that the virJSONValueGetNumberUlong
does not return -1.  That's why it makes you use the return value.

Also these are another cases where you can execute the fallback instead.

Thanks for taking the time to polish this.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/fb7efb22/attachment.sig>

From mkletzan at redhat.com  Thu Jul  7 15:15:29 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 7 Jul 2022 17:15:29 +0200
Subject: [PATCH] qemu_monitor_json: Implement logic for setting
 iothread.thread-pool-{min, max}
In-Reply-To: <e3a61bc19b43a4c61a8e0de439d6912324c00280.1656593281.git.mprivozn@redhat.com>
References: <e3a61bc19b43a4c61a8e0de439d6912324c00280.1656593281.git.mprivozn@redhat.com>
Message-ID: <Ysb4kTt8GaBaNLqw@wheatley>

On Thu, Jun 30, 2022 at 02:48:01PM +0200, Michal Privoznik wrote:
>When virDomainSetIOThreadParams() API is called, well its QEMU
>impl: qemuDomainSetIOThreadParams() then typed params are parsed
>by qemuDomainIOThreadParseParams() into this
>qemuMonitorIOThreadInfo struct. In the struct we have a <int,
>bool> pair for every IOThread attribute we can tune through
>monitor. The struct is then passed to
>qemuMonitorJSONSetIOThread() which looks at the bool and if set
>then the corresponding attribute is set to given value. Each
>attribute is thus changed in a separate call. While this works
>for attributes independent of each other ("poll-max-ns",
>"poll-grow", "poll-shrink"), it does not always work for the
>other attributes ("thread-pool-min" and "thread-pool-max").
>
>The limitation here is that the lower boundary (minimum) has to
>be lower (or equal to) the upper boundary (maximum) at all times.
>
>This means, that in some cases we might need to set attributes in
>reversed order to meet the constraint.
>
>Resolves: https://gitlab.com/libvirt/libvirt/-/issues/339
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220707/82a06fb7/attachment.sig>

From mprivozn at redhat.com  Fri Jul  8 07:55:09 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 09:55:09 +0200
Subject: [PATCH 0/5] Follow up fixes for IOThreads
Message-ID: <cover.1657266850.git.mprivozn@redhat.com>

Couple of issues were found with my recent work on IOThread and its pool
size limits. Here are fixes.

Michal Pr?vozn?k (5):
  domain_conf: Format <defaultiothread/> more often
  domain_conf: Format iothread IDs more often
  qemu: Make IOThread changing more robust
  qemuDomainSetIOThreadParams: Accept VIR_DOMAIN_AFFECT_CONFIG flag
  virsh: Implement --config for iothreadset

 src/conf/domain_conf.c |  50 ++++++++++----------
 src/qemu/qemu_driver.c | 101 +++++++++++++++++++++++------------------
 tools/virsh-domain.c   |   8 ++++
 3 files changed, 90 insertions(+), 69 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Fri Jul  8 07:55:10 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 09:55:10 +0200
Subject: [PATCH 1/5] domain_conf: Format <defaultiothread/> more often
In-Reply-To: <cover.1657266850.git.mprivozn@redhat.com>
References: <cover.1657266850.git.mprivozn@redhat.com>
Message-ID: <8fe58c309c66f890de05c403ab0da89115b905a3.1657266850.git.mprivozn@redhat.com>

The <defaultiothread/> element is formatted inside
virDomainDefaultIOThreadDefFormat() which is called only from
virDomainDefIOThreadsFormat() (so that IOThread related stuff is
formatted calling one function). However, when there are no
<iothreadids/> defined (or only autoallocated ones are present),
then the outer formatting function exits early never calling the
<defaultiothread/> formatter.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c | 46 ++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b639022396..24f17a8b91 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26349,40 +26349,38 @@ static void
 virDomainDefIOThreadsFormat(virBuffer *buf,
                             const virDomainDef *def)
 {
-    g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
-    size_t i;
-
-    if (def->niothreadids == 0)
-        return;
+    if (def->niothreadids > 0) {
+        virBufferAsprintf(buf, "<iothreads>%zu</iothreads>\n",
+                          def->niothreadids);
+    }
 
-    virBufferAsprintf(buf, "<iothreads>%zu</iothreads>\n",
-                      def->niothreadids);
+    if (virDomainDefIothreadShouldFormat(def)) {
+        g_auto(virBuffer) childrenBuf = VIR_BUFFER_INIT_CHILD(buf);
+        size_t i;
 
-    if (!virDomainDefIothreadShouldFormat(def))
-        return;
+        for (i = 0; i < def->niothreadids; i++) {
+            virDomainIOThreadIDDef *iothread = def->iothreadids[i];
+            g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
 
-    for (i = 0; i < def->niothreadids; i++) {
-        virDomainIOThreadIDDef *iothread = def->iothreadids[i];
-        g_auto(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
+            virBufferAsprintf(&attrBuf, " id='%u'",
+                              iothread->iothread_id);
 
-        virBufferAsprintf(&attrBuf, " id='%u'",
-                          iothread->iothread_id);
+            if (iothread->thread_pool_min >= 0) {
+                virBufferAsprintf(&attrBuf, " thread_pool_min='%d'",
+                                  iothread->thread_pool_min);
+            }
 
-        if (iothread->thread_pool_min >= 0) {
-            virBufferAsprintf(&attrBuf, " thread_pool_min='%d'",
-                              iothread->thread_pool_min);
-        }
+            if (iothread->thread_pool_max >= 0) {
+                virBufferAsprintf(&attrBuf, " thread_pool_max='%d'",
+                                  iothread->thread_pool_max);
+            }
 
-        if (iothread->thread_pool_max >= 0) {
-            virBufferAsprintf(&attrBuf, " thread_pool_max='%d'",
-                              iothread->thread_pool_max);
+            virXMLFormatElement(&childrenBuf, "iothread", &attrBuf, NULL);
         }
 
-        virXMLFormatElement(&childrenBuf, "iothread", &attrBuf, NULL);
+        virXMLFormatElement(buf, "iothreadids", NULL, &childrenBuf);
     }
 
-    virXMLFormatElement(buf, "iothreadids", NULL, &childrenBuf);
-
     virDomainDefaultIOThreadDefFormat(buf, def);
 }
 
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul  8 07:55:11 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 09:55:11 +0200
Subject: [PATCH 2/5] domain_conf: Format iothread IDs more often
In-Reply-To: <cover.1657266850.git.mprivozn@redhat.com>
References: <cover.1657266850.git.mprivozn@redhat.com>
Message-ID: <e32023f40600b1aaedfcba1aef3f4c341f66ab86.1657266850.git.mprivozn@redhat.com>

When formatting IOThreads (in virDomainDefIOThreadsFormat()), we
may only output the number of IOThreads, or the full list of IOThreads too:

  <iothreads>4</iothreads>
  <iothreadids>
    <iothread id='1' thread_pool_max='10'/>
    <iothread id='2' thread_pool_min='2' thread_pool_max='10'/>
    <iothread id='3'/>
    <iothread id='4'/>
  </iothreadids>

Now, the deciding factor here is whether those individual
IOThreads were so called 'autofill-ed' or user provided. Well, we
need to take another factor in: if an IOThread has pool size
limit set, then we ought to format the full list.

But how can we get into a situation when a thread is autofilled
(i.e. not provided by user in the XML) and yet it has pool size
limit set? virDomainSetIOThreadParams() is the answer.

Sure, we could also unset the autofill flag whenever a pool size
limit is being set. But this approach allows us to not format
anything if the limits are reset (we don't lose the autofill
information).

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 24f17a8b91..e80616fe7b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26314,7 +26314,9 @@ virDomainDefIothreadShouldFormat(const virDomainDef *def)
     size_t i;
 
     for (i = 0; i < def->niothreadids; i++) {
-        if (!def->iothreadids[i]->autofill)
+        if (!def->iothreadids[i]->autofill ||
+            def->iothreadids[i]->thread_pool_min >= 0 ||
+            def->iothreadids[i]->thread_pool_max >= 0)
             return true;
     }
 
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul  8 07:55:12 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 09:55:12 +0200
Subject: [PATCH 3/5] qemu: Make IOThread changing more robust
In-Reply-To: <cover.1657266850.git.mprivozn@redhat.com>
References: <cover.1657266850.git.mprivozn@redhat.com>
Message-ID: <7ca872227edbce57c7f9dfbfa3b8296dcb0a40a2.1657266850.git.mprivozn@redhat.com>

There are three APIs that allow changing IOThreads:

  virDomainAddIOThread()
  virDomainDelIOThread()
  virDomainSetIOThreadParams()

In case of QEMU driver these are handled by
qemuDomainChgIOThread() which attempts to be versatile enough to
work on both inactive and live domain definitions at the same
time. However, it's a bit clumsy - when a change to live
definition succeeds but fails in inactive definition then there's
no rollback. And somewhat rightfully so - changes to live
definition are in general harder to roll back. Therefore, do what
we do elsewhere (qemuDomainAttachDeviceLiveAndConfig(),
qemuDomainDetachDeviceAliasLiveAndConfig(), ...):

  1) do the change to inactive XML first,
  2) in fact, do the change to a copy of inactive XML,
  3) swap inactive XML and its copy only after everything
     succeeded.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_driver.c | 98 ++++++++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c4418df1ed..e30b1b8d84 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5595,6 +5595,7 @@ qemuDomainChgIOThread(virQEMUDriver *driver,
 {
     g_autoptr(virQEMUDriverConfig) cfg = NULL;
     qemuDomainObjPrivate *priv;
+    g_autoptr(virDomainDef) defcopy = NULL;
     virDomainDef *def;
     virDomainDef *persistentDef;
     virDomainIOThreadIDDef *iothreaddef = NULL;
@@ -5610,6 +5611,55 @@ qemuDomainChgIOThread(virQEMUDriver *driver,
     if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
         goto endjob;
 
+    if (persistentDef) {
+        /* Make a copy of persistent definition and do all the changes there.
+         * Swap the definitions only after changes to live definition
+         * succeeded. */
+        if (!(defcopy = virDomainObjCopyPersistentDef(vm, driver->xmlopt,
+                                                      priv->qemuCaps)))
+            return -1;
+
+        switch (action) {
+        case VIR_DOMAIN_IOTHREAD_ACTION_ADD:
+            if (virDomainDriverAddIOThreadCheck(defcopy, iothread.iothread_id) < 0)
+                goto endjob;
+
+            if (!virDomainIOThreadIDAdd(defcopy, iothread.iothread_id))
+                goto endjob;
+
+            break;
+
+        case VIR_DOMAIN_IOTHREAD_ACTION_DEL:
+            if (virDomainDriverDelIOThreadCheck(defcopy, iothread.iothread_id) < 0)
+                goto endjob;
+
+            virDomainIOThreadIDDel(defcopy, iothread.iothread_id);
+
+            break;
+
+        case VIR_DOMAIN_IOTHREAD_ACTION_MOD:
+            iothreaddef = virDomainIOThreadIDFind(defcopy, iothread.iothread_id);
+
+            if (!iothreaddef) {
+                virReportError(VIR_ERR_INVALID_ARG,
+                               _("cannot find IOThread '%u' in iothreadids"),
+                               iothread.iothread_id);
+                goto endjob;
+            }
+
+            if (qemuDomainIOThreadValidate(iothreaddef, iothread, false) < 0)
+                goto endjob;
+
+            if (qemuDomainHotplugModIOThreadIDDef(iothreaddef, iothread) < 0) {
+                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+                               _("configuring persistent polling values is not supported"));
+                goto endjob;
+            }
+
+            break;
+        }
+    }
+
     if (def) {
         if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD)) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -5660,50 +5710,12 @@ qemuDomainChgIOThread(virQEMUDriver *driver,
         qemuDomainSaveStatus(vm);
     }
 
-    if (persistentDef) {
-        switch (action) {
-        case VIR_DOMAIN_IOTHREAD_ACTION_ADD:
-            if (virDomainDriverAddIOThreadCheck(persistentDef, iothread.iothread_id) < 0)
-                goto endjob;
-
-            if (!virDomainIOThreadIDAdd(persistentDef, iothread.iothread_id))
-                goto endjob;
-
-            break;
-
-        case VIR_DOMAIN_IOTHREAD_ACTION_DEL:
-            if (virDomainDriverDelIOThreadCheck(persistentDef, iothread.iothread_id) < 0)
-                goto endjob;
-
-            virDomainIOThreadIDDel(persistentDef, iothread.iothread_id);
-
-            break;
-
-        case VIR_DOMAIN_IOTHREAD_ACTION_MOD:
-            iothreaddef = virDomainIOThreadIDFind(persistentDef, iothread.iothread_id);
-
-            if (!iothreaddef) {
-                virReportError(VIR_ERR_INVALID_ARG,
-                               _("cannot find IOThread '%u' in iothreadids"),
-                               iothread.iothread_id);
-                goto endjob;
-            }
-
-            if (qemuDomainIOThreadValidate(iothreaddef, iothread, false) < 0)
-                goto endjob;
-
-            if (qemuDomainHotplugModIOThreadIDDef(iothreaddef, iothread) < 0) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("configuring persistent polling values is not supported"));
-                goto endjob;
-            }
-
-            break;
-        }
-
-        if (virDomainDefSave(persistentDef, driver->xmlopt,
-                             cfg->configDir) < 0)
+    /* Finally, if no error until here, we can save config. */
+    if (defcopy) {
+        if (virDomainDefSave(defcopy, driver->xmlopt, cfg->configDir) < 0)
             goto endjob;
+
+        virDomainObjAssignDef(vm, &defcopy, false, NULL);
     }
 
     ret = 0;
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul  8 07:55:13 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 09:55:13 +0200
Subject: [PATCH 4/5] qemuDomainSetIOThreadParams: Accept
 VIR_DOMAIN_AFFECT_CONFIG flag
In-Reply-To: <cover.1657266850.git.mprivozn@redhat.com>
References: <cover.1657266850.git.mprivozn@redhat.com>
Message-ID: <dde4e2247b9c7050e410eeec3dd216774f8f25fb.1657266850.git.mprivozn@redhat.com>

It was always possible to modify the inactive XML, because
VIR_DOMAIN_AFFECT_CURRENT (= 0) is accepted implicitly. But now
that the logic when changing both config and live XMLs is more
robust we can accept VIR_DOMAIN_AFFECT_CONFIG flag too.

Signed-off-by: Michal Privoznik <mprivozn at 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 e30b1b8d84..da95f947e7 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5819,7 +5819,8 @@ qemuDomainSetIOThreadParams(virDomainPtr dom,
     qemuMonitorIOThreadInfo iothread = {0};
     int ret = -1;
 
-    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE, -1);
+    virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
+                  VIR_DOMAIN_AFFECT_CONFIG, -1);
 
     if (iothread_id == 0) {
         virReportError(VIR_ERR_INVALID_ARG, "%s",
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul  8 07:55:14 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 09:55:14 +0200
Subject: [PATCH 5/5] virsh: Implement --config for iothreadset
In-Reply-To: <cover.1657266850.git.mprivozn@redhat.com>
References: <cover.1657266850.git.mprivozn@redhat.com>
Message-ID: <d7ddbdd497c33959e6d5d5de33686660733fa690.1657266850.git.mprivozn@redhat.com>

Our man page already documents that iothreadset has --config
argument. Well, it doesn't really. Normally, I'd just fix the man
page, but with recent work on the API it's possible to tweak
values for inactive XML too. Therefore, implement the --config
argument for the command.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tools/virsh-domain.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 43034f2f81..da63cc95ff 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -7831,6 +7831,7 @@ static const vshCmdOptDef opts_iothreadset[] = {
      .type = VSH_OT_INT,
      .help = N_("upper boundary for worker thread pool")
     },
+    VIRSH_COMMON_OPT_DOMAIN_CONFIG,
     VIRSH_COMMON_OPT_DOMAIN_LIVE,
     VIRSH_COMMON_OPT_DOMAIN_CURRENT,
     {.name = NULL}
@@ -7842,6 +7843,8 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd)
     g_autoptr(virshDomain) dom = NULL;
     int id = 0;
     bool ret = false;
+    bool current = vshCommandOptBool(cmd, "current");
+    bool config = vshCommandOptBool(cmd, "config");
     bool live = vshCommandOptBool(cmd, "live");
     unsigned int flags = VIR_DOMAIN_AFFECT_CURRENT;
     virTypedParameterPtr params = NULL;
@@ -7852,8 +7855,13 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd)
     int thread_val;
     int rc;
 
+    VSH_EXCLUSIVE_OPTIONS_VAR(current, live);
+    VSH_EXCLUSIVE_OPTIONS_VAR(current, config);
+
     if (live)
         flags |= VIR_DOMAIN_AFFECT_LIVE;
+    if (config)
+        flags |= VIR_DOMAIN_AFFECT_CONFIG;
 
     if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
         return false;
-- 
2.35.1


From minglei.liu at smartx.com  Wed Jul  6 09:57:10 2022
From: minglei.liu at smartx.com (minglei.liu)
Date: Wed,  6 Jul 2022 02:57:10 -0700
Subject: [PATCH] qemu: support hotplug cdrom with usb/scsi bus
Message-ID: <20220706095710.498385-1-minglei.liu@smartx.com>

Qemu support hotplug cdrom device with usb or scsi bus,
just unblock these devices in qemuDomainAttachDeviceDiskLiveInternal
and qemuDomainDetachPrepDisk.

Fixes: #261

Signed-off-by: minglei.liu <minglei.liu at smartx.com>
---
 src/qemu/qemu_hotplug.c                       | 13 +++-
 tests/qemuhotplugtest.c                       | 18 ++++++
 .../qemuhotplug-cdrom-scsi.xml                |  6 ++
 .../qemuhotplug-cdrom-usb.xml                 |  6 ++
 .../qemuhotplug-base-live+cdrom-scsi.xml      | 60 +++++++++++++++++++
 .../qemuhotplug-base-live+cdrom-usb.xml       | 60 +++++++++++++++++++
 6 files changed, 160 insertions(+), 3 deletions(-)
 create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml
 create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml
 create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
 create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 27e68370cf..d917086023 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -992,10 +992,9 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
     bool releaseSeclabel = false;
     int ret = -1;
 
-    if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ||
-        disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
+    if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("cdrom/floppy device hotplug isn't supported"));
+                       _("floppy device hotplug isn't supported"));
         return -1;
     }
 
@@ -1025,6 +1024,10 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
         break;
 
     case VIR_DOMAIN_DISK_BUS_VIRTIO:
+        if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
+                       _("cdrom device with virtio bus isn't supported"));
+        }
         if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev) < 0)
             goto cleanup;
         break;
@@ -5414,6 +5417,10 @@ qemuDomainDetachPrepDisk(virDomainObj *vm,
 
     case VIR_DOMAIN_DISK_DEVICE_CDROM:
     case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+        if ((virDomainDiskBus) disk->bus == VIR_DOMAIN_DISK_BUS_USB ||
+            (virDomainDiskBus) disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {
+            break;
+        }
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("disk device type '%s' cannot be detached"),
                        virDomainDiskDeviceTypeToString(disk->device));
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index e98d9845e8..3c9dac241a 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -860,6 +860,24 @@ mymain(void)
     DO_TEST_DETACH("base-live", "guestfwd", false, false,
                    "netdev_del", QMP_OK);
 
+    DO_TEST_ATTACH("base-live", "cdrom-usb", false, true,
+                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "device_add", QMP_OK);
+    DO_TEST_DETACH("base-live", "cdrom-usb", true, true,
+                   "device_del", QMP_OK);
+    DO_TEST_DETACH("base-live", "cdrom-usb", false, false,
+                   "device_del", QMP_DEVICE_DELETED("usb-disk4") QMP_OK,
+                   "human-monitor-command", HMP(""));
+
+    DO_TEST_ATTACH("base-live", "cdrom-scsi", false, true,
+                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "device_add", QMP_OK);
+    DO_TEST_DETACH("base-live", "cdrom-scsi", true, true,
+                   "device_del", QMP_OK);
+    DO_TEST_DETACH("base-live", "cdrom-scsi", false, false,
+                   "device_del", QMP_DEVICE_DELETED("scsi0-0-0-4") QMP_OK,
+                   "human-monitor-command", HMP(""));
+
 #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \
     do { \
         cpudata.test = prefix; \
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml
new file mode 100644
index 0000000000..da8b94bb22
--- /dev/null
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml
@@ -0,0 +1,6 @@
+<disk type='file' device='cdrom'>
+  <driver name='qemu' type='raw' cache='none'/>
+  <source file='/dev/null'/>
+  <target dev='sde' bus='scsi'/>
+  <readonly/>
+</disk>
diff --git a/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml
new file mode 100644
index 0000000000..efb974090c
--- /dev/null
+++ b/tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml
@@ -0,0 +1,6 @@
+<disk type='file' device='cdrom'>
+  <driver name='qemu' type='raw' cache='none'/>
+  <source file='/dev/null'/>
+  <target dev='sde' bus='usb'/>
+  <readonly/>
+</disk>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
new file mode 100644
index 0000000000..c3242a582f
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
@@ -0,0 +1,60 @@
+<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='file' device='cdrom'>
+      <driver name='qemu' type='raw' cache='none'/>
+      <source file='/dev/null'/>
+      <backingStore/>
+      <target dev='sde' bus='scsi'/>
+      <readonly/>
+      <alias name='scsi0-0-0-4'/>
+      <address type='drive' controller='0' bus='0' target='0' unit='4'/>
+    </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>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+  <seclabel type='none' model='none'/>
+</domain>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml
new file mode 100644
index 0000000000..89317f5dc8
--- /dev/null
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml
@@ -0,0 +1,60 @@
+<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='file' device='cdrom'>
+      <driver name='qemu' type='raw' cache='none'/>
+      <source file='/dev/null'/>
+      <backingStore/>
+      <target dev='sde' bus='usb'/>
+      <readonly/>
+      <alias name='usb-disk4'/>
+      <address type='usb' bus='0' port='1'/>
+    </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>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+  <seclabel type='none' model='none'/>
+</domain>
-- 
2.27.0


From mprivozn at redhat.com  Fri Jul  8 10:49:13 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 12:49:13 +0200
Subject: [PATCH] virsh: Require --xpath for dumpxml
Message-ID: <74f68edcc76493695f8bd5db104558c698eb8d06.1657277353.git.mprivozn@redhat.com>

Historically, the dumpxml command reject any unknown arguments,
for instance:

    virsh dumpxml fedora xxx

However, after v8.5.0-rc1~31 the second argument ('xxx') is
treated as an XPath, but it's not that clearly visible.
Therefore, require the --xpath switch, like this:

    virsh dumpxml fedora --xpath xxx

Yes, this breaks already released virsh, but I think we can argue
that the pool of users of this particular function is very small.
The sooner we do this change, the better.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tools/virsh-domain.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 43034f2f81..a181ae005f 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -10461,6 +10461,7 @@ static const vshCmdOptDef opts_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
-- 
2.35.1


From berrange at redhat.com  Fri Jul  8 11:23:12 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 8 Jul 2022 12:23:12 +0100
Subject: [PATCH] virsh: Require --xpath for dumpxml
In-Reply-To: <74f68edcc76493695f8bd5db104558c698eb8d06.1657277353.git.mprivozn@redhat.com>
References: <74f68edcc76493695f8bd5db104558c698eb8d06.1657277353.git.mprivozn@redhat.com>
Message-ID: <YsgToBBPb5m9jVjK@redhat.com>

On Fri, Jul 08, 2022 at 12:49:13PM +0200, Michal Privoznik wrote:
> Historically, the dumpxml command reject any unknown arguments,
> for instance:
> 
>     virsh dumpxml fedora xxx
> 
> However, after v8.5.0-rc1~31 the second argument ('xxx') is
> treated as an XPath, but it's not that clearly visible.
> Therefore, require the --xpath switch, like this:
> 
>     virsh dumpxml fedora --xpath xxx
> 
> Yes, this breaks already released virsh, but I think we can argue
> that the pool of users of this particular function is very small.
> The sooner we do this change, the better.
> 
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  tools/virsh-domain.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> index 43034f2f81..a181ae005f 100644
> --- a/tools/virsh-domain.c
> +++ b/tools/virsh-domain.c
> @@ -10461,6 +10461,7 @@ static const vshCmdOptDef opts_dumpxml[] = {
>      },
>      {.name = "xpath",
>       .type = VSH_OT_STRING,
> +     .flags = VSH_OFLAG_REQ_OPT,
>       .completer = virshCompleteEmpty,
>       .help = N_("xpath expression to filter the XML document")
>      },

Opps, shouldn't we do the same change for all the other 'xpath'
parameters.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mprivozn at redhat.com  Fri Jul  8 11:58:08 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 8 Jul 2022 13:58:08 +0200
Subject: [PATCH] virsh: Require --xpath for dumpxml
In-Reply-To: <YsgToBBPb5m9jVjK@redhat.com>
References: <74f68edcc76493695f8bd5db104558c698eb8d06.1657277353.git.mprivozn@redhat.com>
 <YsgToBBPb5m9jVjK@redhat.com>
Message-ID: <2835e26a-1031-f760-53e6-8cb68dda5cae@redhat.com>

On 7/8/22 13:23, Daniel P. Berrang? wrote:
> On Fri, Jul 08, 2022 at 12:49:13PM +0200, Michal Privoznik wrote:
>> Historically, the dumpxml command reject any unknown arguments,
>> for instance:
>>
>>     virsh dumpxml fedora xxx
>>
>> However, after v8.5.0-rc1~31 the second argument ('xxx') is
>> treated as an XPath, but it's not that clearly visible.
>> Therefore, require the --xpath switch, like this:
>>
>>     virsh dumpxml fedora --xpath xxx
>>
>> Yes, this breaks already released virsh, but I think we can argue
>> that the pool of users of this particular function is very small.
>> The sooner we do this change, the better.
>>
>> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
>>  tools/virsh-domain.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
>> index 43034f2f81..a181ae005f 100644
>> --- a/tools/virsh-domain.c
>> +++ b/tools/virsh-domain.c
>> @@ -10461,6 +10461,7 @@ static const vshCmdOptDef opts_dumpxml[] = {
>>      },
>>      {.name = "xpath",
>>       .type = VSH_OT_STRING,
>> +     .flags = VSH_OFLAG_REQ_OPT,
>>       .completer = virshCompleteEmpty,
>>       .help = N_("xpath expression to filter the XML document")
>>      },
> 
> Opps, shouldn't we do the same change for all the other 'xpath'
> parameters.
> 

I guess we should. But I worry that we might break some users scripts.
But I guess if you're okay with it then so am I.

Michal


From berrange at redhat.com  Fri Jul  8 12:10:14 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Fri, 8 Jul 2022 13:10:14 +0100
Subject: [PATCH] virsh: Require --xpath for dumpxml
In-Reply-To: <2835e26a-1031-f760-53e6-8cb68dda5cae@redhat.com>
References: <74f68edcc76493695f8bd5db104558c698eb8d06.1657277353.git.mprivozn@redhat.com>
 <YsgToBBPb5m9jVjK@redhat.com>
 <2835e26a-1031-f760-53e6-8cb68dda5cae@redhat.com>
Message-ID: <Ysgepi//2byuQhA7@redhat.com>

On Fri, Jul 08, 2022 at 01:58:08PM +0200, Michal Pr?vozn?k wrote:
> On 7/8/22 13:23, Daniel P. Berrang? wrote:
> > On Fri, Jul 08, 2022 at 12:49:13PM +0200, Michal Privoznik wrote:
> >> Historically, the dumpxml command reject any unknown arguments,
> >> for instance:
> >>
> >>     virsh dumpxml fedora xxx
> >>
> >> However, after v8.5.0-rc1~31 the second argument ('xxx') is
> >> treated as an XPath, but it's not that clearly visible.
> >> Therefore, require the --xpath switch, like this:
> >>
> >>     virsh dumpxml fedora --xpath xxx
> >>
> >> Yes, this breaks already released virsh, but I think we can argue
> >> that the pool of users of this particular function is very small.
> >> The sooner we do this change, the better.
> >>
> >> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524
> >> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> >> ---
> >>  tools/virsh-domain.c | 1 +
> >>  1 file changed, 1 insertion(+)
> >>
> >> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> >> index 43034f2f81..a181ae005f 100644
> >> --- a/tools/virsh-domain.c
> >> +++ b/tools/virsh-domain.c
> >> @@ -10461,6 +10461,7 @@ static const vshCmdOptDef opts_dumpxml[] = {
> >>      },
> >>      {.name = "xpath",
> >>       .type = VSH_OT_STRING,
> >> +     .flags = VSH_OFLAG_REQ_OPT,
> >>       .completer = virshCompleteEmpty,
> >>       .help = N_("xpath expression to filter the XML document")
> >>      },
> > 
> > Opps, shouldn't we do the same change for all the other 'xpath'
> > parameters.
> > 
> 
> I guess we should. But I worry that we might break some users scripts.
> But I guess if you're okay with it then so am I.

It was documented as --xpath in the man page.  That you could give it
positionally was an oversight of mine, thanks to our crazy homegrown
CLI parser behaviour. Did I mention I wished we just used getopt...

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mprivozn at redhat.com  Fri Jul  8 12:42:43 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 14:42:43 +0200
Subject: [PATCH] vircpi: Add PCIe 5.0 and 6.0 link speeds
Message-ID: <26bae2f36a9c76a6f78ea68d91370b62e9d1b317.1657284163.git.mprivozn@redhat.com>

The PCIe 5.0 and PCIe 6.0 standards define new link speeds:
32GT/s and 64GT/s, respectively. Update our internal enum to
include these new speeds. Otherwise we format incorrect XML:

  <pci-express>
    <link validity='cap' port='0' speed='(null)' width='16'/>
    <link validity='sta' speed='16' width='16'/>
  </pci-express>

Like all "good" specifications, these are also locked behind a
login portal. But we can look at pciutils' source code: [1] and
[2].

1: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=caca31a0eea41c7b051705704c1158fddc02fbd2
2: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105231
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/util/virpci.c | 2 +-
 src/util/virpci.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/util/virpci.c b/src/util/virpci.c
index 03d1d7b074..7800966963 100644
--- a/src/util/virpci.c
+++ b/src/util/virpci.c
@@ -45,7 +45,7 @@ VIR_LOG_INIT("util.pci");
 
 VIR_ENUM_IMPL(virPCIELinkSpeed,
               VIR_PCIE_LINK_SPEED_LAST,
-              "", "2.5", "5", "8", "16",
+              "", "2.5", "5", "8", "16", "32", "64"
 );
 
 VIR_ENUM_IMPL(virPCIStubDriver,
diff --git a/src/util/virpci.h b/src/util/virpci.h
index b9b9cd7b34..4d9193f24e 100644
--- a/src/util/virpci.h
+++ b/src/util/virpci.h
@@ -83,6 +83,8 @@ typedef enum {
     VIR_PCIE_LINK_SPEED_5,
     VIR_PCIE_LINK_SPEED_8,
     VIR_PCIE_LINK_SPEED_16,
+    VIR_PCIE_LINK_SPEED_32,
+    VIR_PCIE_LINK_SPEED_64,
     VIR_PCIE_LINK_SPEED_LAST
 } virPCIELinkSpeed;
 
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul  8 13:01:50 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri,  8 Jul 2022 15:01:50 +0200
Subject: [PATCH v2] virsh: Require --xpath for *dumpxml
Message-ID: <58c318eb973da98b775762ff42451af883413ff3.1657285230.git.mprivozn@redhat.com>

Historically, the dumpxml command reject any unknown arguments,
for instance:

    virsh dumpxml fedora xxx

However, after v8.5.0-rc1~31 the second argument ('xxx') is
treated as an XPath, but it's not that clearly visible.
Therefore, require the --xpath switch, like this:

    virsh dumpxml fedora --xpath xxx

Yes, this breaks already released virsh, but I think we can argue
that the pool of users of this particular function is very small.
We also document the argument being mandatory:

   dumpxml [--inactive] [--security-info] [--update-cpu] [--migratable]
           [--xpath EXPRESSION] [--wrap] domain

The sooner we do this change, the better.

The same applies for other *dumpxml functions (net-dumpxml,
pool-dumpxml, vol-dumpxl to name a few).

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---

v2 of:

https://listman.redhat.com/archives/libvir-list/2022-July/232733.html

diff to v1:
- Extended commit message to point out that we document --xpath as
  required,
- Fixed the rest of the *dumpxml commands


 tools/virsh-backup.c     | 1 +
 tools/virsh-checkpoint.c | 1 +
 tools/virsh-domain.c     | 3 +++
 tools/virsh-interface.c  | 1 +
 tools/virsh-network.c    | 2 ++
 tools/virsh-nodedev.c    | 1 +
 tools/virsh-nwfilter.c   | 2 ++
 tools/virsh-pool.c       | 1 +
 tools/virsh-secret.c     | 1 +
 tools/virsh-snapshot.c   | 1 +
 tools/virsh-volume.c     | 1 +
 11 files changed, 15 insertions(+)

diff --git a/tools/virsh-backup.c b/tools/virsh-backup.c
index db122abc09..1bb2c63113 100644
--- a/tools/virsh-backup.c
+++ b/tools/virsh-backup.c
@@ -117,6 +117,7 @@ static const vshCmdOptDef opts_backup_dumpxml[] = {
     VIRSH_COMMON_OPT_DOMAIN_FULL(VIR_CONNECT_LIST_DOMAINS_ACTIVE),
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
index a7ef39849d..9605c893af 100644
--- a/tools/virsh-checkpoint.c
+++ b/tools/virsh-checkpoint.c
@@ -854,6 +854,7 @@ static const vshCmdOptDef opts_checkpoint_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 43034f2f81..8c6245ca2a 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -4529,6 +4529,7 @@ static const vshCmdOptDef opts_save_image_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
@@ -4961,6 +4962,7 @@ static const vshCmdOptDef opts_managed_save_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
@@ -10461,6 +10463,7 @@ static const vshCmdOptDef opts_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c
index b29ffc9bef..39ea53ec9d 100644
--- a/tools/virsh-interface.c
+++ b/tools/virsh-interface.c
@@ -472,6 +472,7 @@ static const vshCmdOptDef opts_interface_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-network.c b/tools/virsh-network.c
index 99ced6ccc6..004719dad6 100644
--- a/tools/virsh-network.c
+++ b/tools/virsh-network.c
@@ -351,6 +351,7 @@ static const vshCmdOptDef opts_network_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
@@ -1556,6 +1557,7 @@ static const vshCmdOptDef opts_network_port_dumpxml[] = {
     VIRSH_COMMON_OPT_NETWORK_PORT(0),
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
index 37e361c701..2adcad9c10 100644
--- a/tools/virsh-nodedev.c
+++ b/tools/virsh-nodedev.c
@@ -567,6 +567,7 @@ static const vshCmdOptDef opts_node_device_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c
index ff7f6f4026..d4112c8620 100644
--- a/tools/virsh-nwfilter.c
+++ b/tools/virsh-nwfilter.c
@@ -188,6 +188,7 @@ static const vshCmdOptDef opts_nwfilter_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
@@ -610,6 +611,7 @@ static const vshCmdOptDef opts_nwfilter_binding_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c
index 820a61f889..8a98c6ae40 100644
--- a/tools/virsh-pool.c
+++ b/tools/virsh-pool.c
@@ -777,6 +777,7 @@ static const vshCmdOptDef opts_pool_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c
index 79fa3faf5a..17d2bbd88d 100644
--- a/tools/virsh-secret.c
+++ b/tools/virsh-secret.c
@@ -140,6 +140,7 @@ static const vshCmdOptDef opts_secret_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
index 83fdfb9616..8fa64ba903 100644
--- a/tools/virsh-snapshot.c
+++ b/tools/virsh-snapshot.c
@@ -1609,6 +1609,7 @@ static const vshCmdOptDef opts_snapshot_dumpxml[] = {
     },
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c
index bf72d8135f..300a0aa8e5 100644
--- a/tools/virsh-volume.c
+++ b/tools/virsh-volume.c
@@ -1161,6 +1161,7 @@ static const vshCmdOptDef opts_vol_dumpxml[] = {
     VIRSH_COMMON_OPT_POOL_OPTIONAL,
     {.name = "xpath",
      .type = VSH_OT_STRING,
+     .flags = VSH_OFLAG_REQ_OPT,
      .completer = virshCompleteEmpty,
      .help = N_("xpath expression to filter the XML document")
     },
-- 
2.35.1


From jtomko at redhat.com  Mon Jul 11 07:12:07 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Mon, 11 Jul 2022 09:12:07 +0200
Subject: [PATCH] vircpi: Add PCIe 5.0 and 6.0 link speeds
In-Reply-To: <26bae2f36a9c76a6f78ea68d91370b62e9d1b317.1657284163.git.mprivozn@redhat.com>
References: <26bae2f36a9c76a6f78ea68d91370b62e9d1b317.1657284163.git.mprivozn@redhat.com>
Message-ID: <YsvNR6JZDffNd14M@fedora>

On a Friday in 2022, Michal Privoznik wrote:
>The PCIe 5.0 and PCIe 6.0 standards define new link speeds:
>32GT/s and 64GT/s, respectively. Update our internal enum to
>include these new speeds. Otherwise we format incorrect XML:
>
>  <pci-express>
>    <link validity='cap' port='0' speed='(null)' width='16'/>
>    <link validity='sta' speed='16' width='16'/>
>  </pci-express>
>
>Like all "good" specifications, these are also locked behind a
>login portal. But we can look at pciutils' source code: [1] and
>[2].
>
>1: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=caca31a0eea41c7b051705704c1158fddc02fbd2
>2: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b
>
>Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105231
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/util/virpci.c | 2 +-
> src/util/virpci.h | 2 ++
> 2 files changed, 3 insertions(+), 1 deletion(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220711/83ae282b/attachment.sig>

From pkrempa at redhat.com  Mon Jul 11 12:25:34 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 11 Jul 2022 14:25:34 +0200
Subject: [PATCH] ci: Regenerate files with new lcitool
Message-ID: <89df89ac66de8559635a519234480e4557f99731.1657542257.git.pkrempa@redhat.com>

Apart from other changes this fixes failures with builds on FreeBSD.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---

Note that this is based on lcitool with the following MR merged:

https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/290

which is necessary to fix FreeBSD12:

https://gitlab.com/pipo.sk/libvirt/-/pipelines/584873900

 ci/cirrus/freebsd-12.vars                |  2 +-
 ci/cirrus/freebsd-13.vars                |  2 +-
 ci/containers/centos-stream-8.Dockerfile |  1 +
 ci/containers/centos-stream-9.Dockerfile | 14 ++++--
 ci/gitlab.yml                            | 22 +++++++++
 ci/gitlab/build-templates.yml            | 12 +++--
 ci/gitlab/builds.yml                     | 60 ++++++++++++------------
 ci/gitlab/container-templates.yml        |  8 ++--
 ci/gitlab/containers.yml                 | 43 ++++++++++-------
 9 files changed, 105 insertions(+), 59 deletions(-)

diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars
index e8b06b32e1..b3b3d7a187 100644
--- a/ci/cirrus/freebsd-12.vars
+++ b/ci/cirrus/freebsd-12.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 python3 qemu readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars
index e8b06b32e1..b3b3d7a187 100644
--- a/ci/cirrus/freebsd-13.vars
+++ b/ci/cirrus/freebsd-13.vars
@@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake'
 NINJA='/usr/local/bin/ninja'
 PACKAGING_COMMAND='pkg'
 PIP3='/usr/local/bin/pip-3.8'
-PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py38-docutils py38-flake8 python3 qemu readline yajl'
+PKGS='augeas bash-completion ca_root_nss ccache codespell cppi curl cyrus-sasl diffutils diskscrub fusefs-libs gettext git glib gmake gnugrep gnutls gsed libpcap libpciaccess libssh libssh2 libxml2 libxslt meson ninja perl5 pkgconf polkit py39-docutils py39-flake8 python3 qemu readline yajl'
 PYPI_PKGS=''
 PYTHON='/usr/local/bin/python3'
diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile
index 82cbd7cde7..1614cd9b56 100644
--- a/ci/containers/centos-stream-8.Dockerfile
+++ b/ci/containers/centos-stream-8.Dockerfile
@@ -11,6 +11,7 @@ RUN dnf distro-sync -y && \
     dnf config-manager --set-enabled -y powertools && \
     dnf install -y centos-release-advanced-virtualization && \
     dnf install -y epel-release && \
+    dnf install -y epel-next-release && \
     dnf install -y \
         audit-libs-devel \
         augeas \
diff --git a/ci/containers/centos-stream-9.Dockerfile b/ci/containers/centos-stream-9.Dockerfile
index 34ff3a06eb..5d0b5ffc6c 100644
--- a/ci/containers/centos-stream-9.Dockerfile
+++ b/ci/containers/centos-stream-9.Dockerfile
@@ -9,14 +9,14 @@ FROM quay.io/centos/centos:stream9
 RUN dnf distro-sync -y && \
     dnf install 'dnf-command(config-manager)' -y && \
     dnf config-manager --set-enabled -y crb && \
-    dnf install -y \
-        https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
-        https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm && \
+    dnf install -y epel-release && \
+    dnf install -y epel-next-release && \
     dnf install -y \
         audit-libs-devel \
         augeas \
         bash-completion \
         ca-certificates \
+        ccache \
         clang \
         cpp \
         cyrus-sasl-devel \
@@ -50,6 +50,7 @@ RUN dnf distro-sync -y && \
         librbd-devel \
         libselinux-devel \
         libssh-devel \
+        libssh2-devel \
         libtirpc-devel \
         libwsman-devel \
         libxml2 \
@@ -81,9 +82,14 @@ RUN dnf distro-sync -y && \
         yajl-devel && \
     dnf autoremove -y && \
     dnf clean all -y && \
-    rpm -qa | sort > /packages.txt
+    rpm -qa | sort > /packages.txt && \
+    mkdir -p /usr/libexec/ccache-wrappers && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
+    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc

 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"
 ENV NINJA "/usr/bin/ninja"
 ENV PYTHON "/usr/bin/python3"
+ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index cab4e6074c..ea0f847789 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -4,6 +4,28 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci

+
+# Variables that can be set to control the behaviour of
+# pipelines that are run
+#
+#  - RUN_ALL_CONTAINERS - build all containers
+#    even if they don't have any changes detected
+#
+# These can be set as git push options
+#
+#  $ git push -o ci.variable=RUN_ALL_CONTAINERS=1
+#
+# Aliases can be set for common usage
+#
+#  $ git config --local alias.push-all-ctr "push -o ci.variable=RUN_ALL_CONTAINERS=1"
+#
+# Allowing the less verbose invokation
+#
+#  $ git push-all-ctr
+#
+# Pipeline variables can also be set in the repository
+# pipeline config globally, or set against scheduled pipelines
+
 include:
   - local: '/ci/gitlab/container-templates.yml'
   - local: '/ci/gitlab/build-templates.yml'
diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml
index 20d22914c2..605788dab9 100644
--- a/ci/gitlab/build-templates.yml
+++ b/ci/gitlab/build-templates.yml
@@ -9,7 +9,9 @@
   image: $CI_REGISTRY_IMAGE/ci-$NAME:latest
   stage: builds
   rules:
-    - if: '$LIBVIRT_JOB_OPTIONAL'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$JOB_OPTIONAL'
       when: manual
       allow_failure: true
     - when: on_success
@@ -19,7 +21,9 @@
   image: $CI_REGISTRY_IMAGE/ci-$NAME-cross-$CROSS:latest
   stage: builds
   rules:
-    - if: '$LIBVIRT_JOB_OPTIONAL'
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
+    - if: '$JOB_OPTIONAL'
       when: manual
       allow_failure: true
     - when: on_success
@@ -52,9 +56,9 @@
     - cat ci/cirrus/$NAME.yml
     - cirrus-run -v --show-build-log always ci/cirrus/$NAME.yml
   rules:
-    - if: "$CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null"
+    - if: '$CIRRUS_GITHUB_REPO == null || $CIRRUS_API_TOKEN == null'
       when: never
-    - if: '$LIBVIRT_JOB_OPTIONAL'
+    - if: '$JOB_OPTIONAL'
       when: manual
       allow_failure: true
     - when: on_success
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 3ce110d39e..443c1ac299 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -14,7 +14,7 @@ x86_64-almalinux-8:
       optional: true
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: almalinux-8
     RPM: skip

@@ -48,7 +48,7 @@ x86_64-alpine-315:
       optional: true
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: alpine-315


@@ -107,7 +107,7 @@ x86_64-debian-11:
       optional: true
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -223,7 +223,7 @@ x86_64-ubuntu-2204:
       optional: true
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: ubuntu-2204


@@ -251,7 +251,7 @@ aarch64-debian-10:
   allow_failure: true
   variables:
     CROSS: aarch64
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -263,7 +263,7 @@ armv6l-debian-10:
   allow_failure: true
   variables:
     CROSS: armv6l
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -286,7 +286,7 @@ i686-debian-10:
   allow_failure: true
   variables:
     CROSS: i686
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -298,7 +298,7 @@ mips-debian-10:
   allow_failure: true
   variables:
     CROSS: mips
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -310,7 +310,7 @@ mips64el-debian-10:
   allow_failure: true
   variables:
     CROSS: mips64el
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -322,7 +322,7 @@ mipsel-debian-10:
   allow_failure: true
   variables:
     CROSS: mipsel
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -334,7 +334,7 @@ ppc64le-debian-10:
   allow_failure: true
   variables:
     CROSS: ppc64le
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -346,7 +346,7 @@ s390x-debian-10:
   allow_failure: true
   variables:
     CROSS: s390x
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -358,7 +358,7 @@ aarch64-debian-11:
   allow_failure: false
   variables:
     CROSS: aarch64
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -370,7 +370,7 @@ armv6l-debian-11:
   allow_failure: false
   variables:
     CROSS: armv6l
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -382,7 +382,7 @@ armv7l-debian-11:
   allow_failure: false
   variables:
     CROSS: armv7l
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -394,7 +394,7 @@ i686-debian-11:
   allow_failure: false
   variables:
     CROSS: i686
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -406,7 +406,7 @@ mips64el-debian-11:
   allow_failure: false
   variables:
     CROSS: mips64el
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -418,7 +418,7 @@ mipsel-debian-11:
   allow_failure: false
   variables:
     CROSS: mipsel
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -430,7 +430,7 @@ ppc64le-debian-11:
   allow_failure: false
   variables:
     CROSS: ppc64le
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -442,7 +442,7 @@ s390x-debian-11:
   allow_failure: false
   variables:
     CROSS: s390x
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -454,7 +454,7 @@ aarch64-debian-sid:
   allow_failure: false
   variables:
     CROSS: aarch64
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -466,7 +466,7 @@ armv6l-debian-sid:
   allow_failure: false
   variables:
     CROSS: armv6l
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -478,7 +478,7 @@ armv7l-debian-sid:
   allow_failure: false
   variables:
     CROSS: armv7l
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -490,7 +490,7 @@ i686-debian-sid:
   allow_failure: false
   variables:
     CROSS: i686
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -502,7 +502,7 @@ mips64el-debian-sid:
   allow_failure: false
   variables:
     CROSS: mips64el
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -514,7 +514,7 @@ mipsel-debian-sid:
   allow_failure: false
   variables:
     CROSS: mipsel
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -526,7 +526,7 @@ ppc64le-debian-sid:
   allow_failure: false
   variables:
     CROSS: ppc64le
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -538,7 +538,7 @@ s390x-debian-sid:
   allow_failure: false
   variables:
     CROSS: s390x
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid


@@ -550,7 +550,7 @@ mingw32-fedora-36:
   allow_failure: false
   variables:
     CROSS: mingw32
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: fedora-36


@@ -584,7 +584,7 @@ mingw64-fedora-rawhide:
   allow_failure: true
   variables:
     CROSS: mingw64
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: fedora-rawhide


diff --git a/ci/gitlab/container-templates.yml b/ci/gitlab/container-templates.yml
index c71d03c759..0e52f147bb 100644
--- a/ci/gitlab/container-templates.yml
+++ b/ci/gitlab/container-templates.yml
@@ -10,7 +10,7 @@
 #   - Push to default branch:
 #       -> rebuild if dockerfile changed, no cache
 #   - Otherwise
-#       -> rebuild if LIBVIRT_CI_CONTAINERS=1, no cache,
+#       -> rebuild if RUN_ALL_CONTAINERS=1, no cache,
 #          to pick up new published distro packages or
 #          recover from deleted tag
 #
@@ -40,16 +40,18 @@
   after_script:
     - docker logout
   rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: never
     - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
       when: on_success
       changes:
        - ci/gitlab/container-templates.yml
        - ci/containers/$NAME.Dockerfile
-    - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $LIBVIRT_CI_CONTAINERS == "1"'
+    - if: '$CI_PROJECT_NAMESPACE == "libvirt" && $RUN_ALL_CONTAINERS == "1"'
       when: on_success
     - if: '$CI_PROJECT_NAMESPACE == "libvirt"'
       when: never
-    - if: '$LIBVIRT_JOB_OPTIONAL'
+    - if: '$JOB_OPTIONAL'
       when: manual
       allow_failure: true
     - when: on_success
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 7cdf3eb9a0..3835a19216 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -25,6 +25,7 @@ x86_64-alpine-315-container:
   extends: .container_job
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: alpine-315


@@ -126,6 +127,7 @@ aarch64-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-aarch64


@@ -133,6 +135,7 @@ armv6l-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-armv6l


@@ -147,6 +150,7 @@ i686-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-i686


@@ -154,6 +158,7 @@ mips-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-mips


@@ -161,6 +166,7 @@ mips64el-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-mips64el


@@ -168,6 +174,7 @@ mipsel-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-mipsel


@@ -175,6 +182,7 @@ ppc64le-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-ppc64le


@@ -182,6 +190,7 @@ s390x-debian-10-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-s390x


@@ -189,7 +198,7 @@ aarch64-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-aarch64


@@ -197,7 +206,7 @@ armv6l-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-armv6l


@@ -205,7 +214,7 @@ armv7l-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-armv7l


@@ -213,7 +222,7 @@ i686-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-i686


@@ -221,7 +230,7 @@ mips64el-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-mips64el


@@ -229,7 +238,7 @@ mipsel-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-mipsel


@@ -237,7 +246,7 @@ ppc64le-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-ppc64le


@@ -245,7 +254,7 @@ s390x-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-11-cross-s390x


@@ -253,7 +262,7 @@ aarch64-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-aarch64


@@ -261,7 +270,7 @@ armv6l-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-armv6l


@@ -269,7 +278,7 @@ armv7l-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-armv7l


@@ -277,7 +286,7 @@ i686-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-i686


@@ -285,7 +294,7 @@ mips64el-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-mips64el


@@ -293,7 +302,7 @@ mipsel-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-mipsel


@@ -301,7 +310,7 @@ ppc64le-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-ppc64le


@@ -309,7 +318,7 @@ s390x-debian-sid-container:
   extends: .container_job
   allow_failure: false
   variables:
-    LIBVIRT_JOB_OPTIONAL: 1
+    JOB_OPTIONAL: 1
     NAME: debian-sid-cross-s390x


@@ -317,6 +326,7 @@ mingw32-fedora-36-container:
   extends: .container_job
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: fedora-36-cross-mingw32


@@ -338,4 +348,5 @@ mingw64-fedora-rawhide-container:
   extends: .container_job
   allow_failure: true
   variables:
+    JOB_OPTIONAL: 1
     NAME: fedora-rawhide-cross-mingw64
-- 
2.36.1


From berrange at redhat.com  Mon Jul 11 12:30:58 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 11 Jul 2022 13:30:58 +0100
Subject: [PATCH] ci: Regenerate files with new lcitool
In-Reply-To: <89df89ac66de8559635a519234480e4557f99731.1657542257.git.pkrempa@redhat.com>
References: <89df89ac66de8559635a519234480e4557f99731.1657542257.git.pkrempa@redhat.com>
Message-ID: <YswYAhz6dESiBY5M@redhat.com>

On Mon, Jul 11, 2022 at 02:25:34PM +0200, Peter Krempa wrote:
> Apart from other changes this fixes failures with builds on FreeBSD.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
> 
> Note that this is based on lcitool with the following MR merged:
> 
> https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/290
> 
> which is necessary to fix FreeBSD12:
> 
> https://gitlab.com/pipo.sk/libvirt/-/pipelines/584873900
> 
>  ci/cirrus/freebsd-12.vars                |  2 +-
>  ci/cirrus/freebsd-13.vars                |  2 +-
>  ci/containers/centos-stream-8.Dockerfile |  1 +
>  ci/containers/centos-stream-9.Dockerfile | 14 ++++--
>  ci/gitlab.yml                            | 22 +++++++++
>  ci/gitlab/build-templates.yml            | 12 +++--
>  ci/gitlab/builds.yml                     | 60 ++++++++++++------------
>  ci/gitlab/container-templates.yml        |  8 ++--
>  ci/gitlab/containers.yml                 | 43 ++++++++++-------
>  9 files changed, 105 insertions(+), 59 deletions(-)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From pkrempa at redhat.com  Tue Jul 12 09:34:58 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 12 Jul 2022 11:34:58 +0200
Subject: [(pushed) PATCH] docs: formatstorage: Format XML namespace definition
 as code block
Message-ID: <b7e05cf96683f5c38b2d70176a7882e35b7ef5eb.1657618474.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
Trivial.

 docs/formatstorage.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/formatstorage.rst b/docs/formatstorage.rst
index 83d7d141ac..a8149e450c 100644
--- a/docs/formatstorage.rst
+++ b/docs/formatstorage.rst
@@ -470,9 +470,9 @@ option in libvirt, and thus should never be used in production.
    options for the mount command via the "-o" option for the ``fs`` or ``netfs``
    type storage pools. In order to designate that the Storage Pool will be using
    the mechanism, the ``pool`` element must be modified to provide the XML
-   namespace attribute syntax as follows:
+   namespace attribute syntax as follows::

-   xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'
+      xmlns:fs='http://libvirt.org/schemas/storagepool/fs/1.0'

    The ``fs:mount_opts`` defines the mount options by specifying multiple
    ``fs:option`` subelements with the attribute ``name`` specifying the mount
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 12 10:48:30 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 12 Jul 2022 12:48:30 +0200
Subject: [PATCH] remote: conf: Mention that 'virtproxyd' doesn't require the
 '--listen' flag
Message-ID: <e2b2998b946642952eba5432ba92ae891e4ee3e1.1657622910.git.pkrempa@redhat.com>

'virtproxyd' doesn't have the '--listen' parameter and it's enough just
to enable the corresponding option in the config.

The config file is generic for all the daemons and we just omit/adjust
some sections. Adding a separate mechanism to omit the note about the
'--listen' parameter would be overkill so mention explicitly that it's
required only for libvirtd and not virtproxyd.

The section is omitted for other daemons.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2094641
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/remote/libvirtd.conf.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in
index defe6b83d0..929d3922e9 100644
--- a/src/remote/libvirtd.conf.in
+++ b/src/remote/libvirtd.conf.in
@@ -8,8 +8,10 @@
 #

 # Flag listening for secure TLS connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
-# have any effect.
+#
+# To enable listening sockets with the 'libvirtd' daemon it's also required  to
+# pass the --listen flag on the commandline of the daemon.
+# This is not needed with 'virtproxyd'.
 #
 # This setting is not required or honoured if using systemd socket
 # activation.
@@ -21,8 +23,10 @@
 #listen_tls = 0

 # Listen for unencrypted TCP connections on the public TCP/IP port.
-# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
-# have any effect.
+#
+# To enable listening sockets with the 'libvirtd' daemon it's also required  to
+# pass the --listen flag on the commandline of the daemon.
+# This is not needed with 'virtproxyd'.
 #
 # This setting is not required or honoured if using systemd socket
 # activation.
-- 
2.36.1


From phrdina at redhat.com  Tue Jul 12 12:09:00 2022
From: phrdina at redhat.com (Pavel Hrdina)
Date: Tue, 12 Jul 2022 14:09:00 +0200
Subject: [PATCH] remote: conf: Mention that 'virtproxyd' doesn't require
 the '--listen' flag
In-Reply-To: <e2b2998b946642952eba5432ba92ae891e4ee3e1.1657622910.git.pkrempa@redhat.com>
References: <e2b2998b946642952eba5432ba92ae891e4ee3e1.1657622910.git.pkrempa@redhat.com>
Message-ID: <Ys1kXMzqNIrAdEt+@antique-laptop>

On Tue, Jul 12, 2022 at 12:48:30PM +0200, Peter Krempa wrote:
> 'virtproxyd' doesn't have the '--listen' parameter and it's enough just
> to enable the corresponding option in the config.
> 
> The config file is generic for all the daemons and we just omit/adjust
> some sections. Adding a separate mechanism to omit the note about the
> '--listen' parameter would be overkill so mention explicitly that it's
> required only for libvirtd and not virtproxyd.
> 
> The section is omitted for other daemons.
> 
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2094641
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  src/remote/libvirtd.conf.in | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/src/remote/libvirtd.conf.in b/src/remote/libvirtd.conf.in
> index defe6b83d0..929d3922e9 100644
> --- a/src/remote/libvirtd.conf.in
> +++ b/src/remote/libvirtd.conf.in
> @@ -8,8 +8,10 @@
>  #
> 
>  # Flag listening for secure TLS connections on the public TCP/IP port.
> -# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
> -# have any effect.
> +#
> +# To enable listening sockets with the 'libvirtd' daemon it's also required  to

s/required  to/required to/

> +# pass the --listen flag on the commandline of the daemon.
> +# This is not needed with 'virtproxyd'.
>  #
>  # This setting is not required or honoured if using systemd socket
>  # activation.
> @@ -21,8 +23,10 @@
>  #listen_tls = 0
> 
>  # Listen for unencrypted TCP connections on the public TCP/IP port.
> -# NB, must pass the --listen flag to the @DAEMON_NAME@ process for this to
> -# have any effect.
> +#
> +# To enable listening sockets with the 'libvirtd' daemon it's also required  to

Same here, extra space.

> +# pass the --listen flag on the commandline of the daemon.
> +# This is not needed with 'virtproxyd'.
>  #
>  # This setting is not required or honoured if using systemd socket
>  # activation.

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220712/1591bb20/attachment.sig>

From eskultet at redhat.com  Tue Jul 12 12:44:32 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:32 +0200
Subject: [libvirt PATCH 00/10] docs: Expand documentation on the CI/testing
 topic
Message-ID: <cover.1657629865.git.eskultet@redhat.com>

This series was inspired by QEMU's documentation on CI and focuses on the
following:
- adds documentation on how to add a custom runner to the libvirt project or
  its fork, mainly in context of running functional testing
- replaces the old 'testsuites' article with a more detailed landing page
describing different types of testing available in libvirt
- updates the TCK documentation with details on how TCK should be installed
  and used nowadays

For sure we can add lots more content related to testing in libvirt but I think
this series provides a solid foundation that can be easily expanded on in the
future.

Here's the website build artifact to see what it'll look like eventually:
https://gitlab.com/eskultety/libvirt/-/jobs/2709823650

Erik Skultety (10):
  docs: Move the CI dashboard to its own RST module
  docs: Provide more information about the TCK test suite
  docs: Provide an article on how to add a custom runner to the project
  docs: Provide an article on testing
  docs: Replace testsuites article with the new 'testing' article
  docs: Drop the testsuites article
  docs: Change the CI headline from "CI Testing" to "CI"
  docs: ci: Add info about the two major types of jobs our CI runs
  docs: ci: Add a section on how to add a new platform to libvirt CI
  docs: ci: Add a brief section on how to run the CI workload locally

 docs/ci-dashboard.rst | 216 +++++++++++++++++++++++++++++++++++
 docs/ci-runners.rst   |  86 ++++++++++++++
 docs/ci.rst           | 255 +++++++++++-------------------------------
 docs/docs.rst         |  10 +-
 docs/meson.build      |   4 +-
 docs/testing.rst      | 176 +++++++++++++++++++++++++++++
 docs/testsuites.rst   |  37 ------
 docs/testtck.rst      |  92 +++++++++++++--
 8 files changed, 631 insertions(+), 245 deletions(-)
 create mode 100644 docs/ci-dashboard.rst
 create mode 100644 docs/ci-runners.rst
 create mode 100644 docs/testing.rst
 delete mode 100644 docs/testsuites.rst

-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:33 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:33 +0200
Subject: [libvirt PATCH 01/10] docs: Move the CI dashboard to its own RST
 module
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <6954e11153b795244ab784bfed559f1fa2f87fb8.1657629865.git.eskultet@redhat.com>

The dashboard itself simply takes away focus from everything else that
makes sense to have in the CI article, so move it to it's own article
and link it from the main CI article.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci-dashboard.rst | 216 ++++++++++++++++++++++++++++++++++++++++++
 docs/ci.rst           | 192 +------------------------------------
 docs/meson.build      |   1 +
 3 files changed, 219 insertions(+), 190 deletions(-)
 create mode 100644 docs/ci-dashboard.rst

diff --git a/docs/ci-dashboard.rst b/docs/ci-dashboard.rst
new file mode 100644
index 0000000000..a7f4e71f96
--- /dev/null
+++ b/docs/ci-dashboard.rst
@@ -0,0 +1,216 @@
+===================
+GitLab CI Dashboard
+===================
+
+The dashboard below shows the current status of the GitLab CI jobs for each
+repository:
+
+Core project
+------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt
+     - .. image:: https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt/pipelines
+          :alt: libvirt pipeline status
+
+
+Language bindings
+-----------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-csharp
+     - .. image:: https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-csharp/pipelines
+          :alt: libvirt-csharp pipeline status
+
+   * - libvirt-go-module
+     - .. image:: https://gitlab.com/libvirt/libvirt-go-module/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-go-module/pipelines
+          :alt: libvirt-go-module pipeline status
+
+   * - libvirt-java
+     - .. image:: https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-java/pipelines
+          :alt: libvirt-java pipeline status
+
+   * - libvirt-ocaml
+     - .. image:: https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-ocaml/pipelines
+          :alt: libvirt-ocaml pipeline status
+
+   * - libvirt-perl
+     - .. image:: https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-perl/pipelines
+          :alt: libvirt-perl pipeline status
+
+   * - libvirt-php
+     - .. image:: https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-php/pipelines
+          :alt: libvirt-php pipeline status
+
+   * - libvirt-python
+     - .. image:: https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-python/pipelines
+          :alt: libvirt-python pipeline status
+
+   * - libvirt-ruby
+     - .. image:: https://gitlab.com/libvirt/libvirt-ruby/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-ruby/pipelines
+          :alt: libvirt-ruby pipeline status
+
+   * - libvirt-rust
+     - .. image:: https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-rust/pipelines
+          :alt: libvirt-rust pipeline status
+
+
+Object mappings
+---------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-cim
+     - .. image:: https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-cim/pipelines
+          :alt: libvirt-cim pipeline status
+
+   * - libvirt-dbus
+     - .. image:: https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-dbus/pipelines
+          :alt: libvirt-dbus pipeline status
+
+   * - libvirt-glib
+     - .. image:: https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-glib/pipelines
+          :alt: libvirt-glib pipeline status
+
+   * - libvirt-go-xml-module
+     - .. image:: https://gitlab.com/libvirt/libvirt-go-xml-module/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-go-xml-module/pipelines
+          :alt: libvirt-go-xml-module pipeline status
+
+   * - libvirt-snmp
+     - .. image:: https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-snmp/pipelines
+          :alt: libvirt-snmp pipeline status
+
+
+Testing
+-------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-ci
+     - .. image:: https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-ci/pipelines
+          :alt: libvirt-ci pipeline status
+
+   * - libvirt-test-API
+     - .. image:: https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-test-API/pipelines
+          :alt: libvirt-test-API pipeline status
+
+   * - libvirt-tck
+     - .. image:: https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-tck/pipelines
+          :alt: libvirt-tck pipeline status
+
+
+Documentation / websites
+------------------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-publican
+     - .. image:: https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-publican/pipelines
+          :alt: libvirt-publican pipeline status
+
+   * - libvirt-appdev-guide-python
+     - .. image:: https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines
+          :alt: libvirt-appdev-guide-python pipeline status
+
+   * - libvirt-wiki
+     - .. image:: https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-wiki/pipelines
+          :alt: libvirt-wiki pipeline status
+
+   * - virttools-planet
+     - .. image:: https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/virttools-planet/pipelines
+          :alt: virttools-planet pipeline status
+
+   * - virttools-web
+     - .. image:: https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/virttools-web/pipelines
+          :alt: virttools-web pipeline status
+
+
+Miscellaneous
+-------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-console-proxy
+     - .. image:: https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-console-proxy/pipelines
+          :alt: libvirt-console-proxy pipeline status
+
+   * - libvirt-designer
+     - .. image:: https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-designer/pipelines
+          :alt: libvirt-designer pipeline status
+
+   * - libvirt-devaddr
+     - .. image:: https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-devaddr/pipelines
+          :alt: libvirt-devaddr pipeline status
+
+   * - libvirt-sandbox
+     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-sandbox/pipelines
+          :alt: libvirt-sandbox pipeline status
+
+   * - libvirt-sandbox-image
+     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines
+          :alt: libvirt-sandbox-image pipeline status
+
+   * - libvirt-security-notice
+     - .. image:: https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-security-notice/pipelines
+          :alt: libvirt-security-notice pipeline status
diff --git a/docs/ci.rst b/docs/ci.rst
index 71418d74bf..d5282c4d25 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -5,6 +5,8 @@ Libvirt Continuous Integration
 .. contents::
 
 The libvirt project uses GitLab CI for automated testing.
+`Here's <ci-dashboard.html>`__ our CI dashboard which shows the current status
+of our pipelines.
 
 Linux builds and cross-compiled Windows builds happen on GitLab CI's shared
 runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
@@ -13,217 +15,27 @@ runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
 Most of the tooling used to build CI pipelines is maintained as part of the
 `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci>`_ subproject.
 
-GitLab CI Dashboard
-===================
 
-The dashboard below shows the current status of the GitLab CI jobs for each
-repository:
 
-Core project
-------------
 
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
 
-   * - Project
-     - Pipeline
 
-   * - libvirt
-     - .. image:: https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt/pipelines
-          :alt: libvirt pipeline status
 
 
-Language bindings
------------------
 
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
 
-   * - Project
-     - Pipeline
 
-   * - libvirt-csharp
-     - .. image:: https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-csharp/pipelines
-          :alt: libvirt-csharp pipeline status
 
-   * - libvirt-go-module
-     - .. image:: https://gitlab.com/libvirt/libvirt-go-module/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-go-module/pipelines
-          :alt: libvirt-go-module pipeline status
 
-   * - libvirt-java
-     - .. image:: https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-java/pipelines
-          :alt: libvirt-java pipeline status
 
-   * - libvirt-ocaml
-     - .. image:: https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-ocaml/pipelines
-          :alt: libvirt-ocaml pipeline status
 
-   * - libvirt-perl
-     - .. image:: https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-perl/pipelines
-          :alt: libvirt-perl pipeline status
 
-   * - libvirt-php
-     - .. image:: https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-php/pipelines
-          :alt: libvirt-php pipeline status
 
-   * - libvirt-python
-     - .. image:: https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-python/pipelines
-          :alt: libvirt-python pipeline status
 
-   * - libvirt-ruby
-     - .. image:: https://gitlab.com/libvirt/libvirt-ruby/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-ruby/pipelines
-          :alt: libvirt-ruby pipeline status
-
-   * - libvirt-rust
-     - .. image:: https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-rust/pipelines
-          :alt: libvirt-rust pipeline status
 
 
-Object mappings
----------------
 
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
 
-   * - Project
-     - Pipeline
 
-   * - libvirt-cim
-     - .. image:: https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-cim/pipelines
-          :alt: libvirt-cim pipeline status
 
-   * - libvirt-dbus
-     - .. image:: https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-dbus/pipelines
-          :alt: libvirt-dbus pipeline status
 
-   * - libvirt-glib
-     - .. image:: https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-glib/pipelines
-          :alt: libvirt-glib pipeline status
-
-   * - libvirt-go-xml-module
-     - .. image:: https://gitlab.com/libvirt/libvirt-go-xml-module/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-go-xml-module/pipelines
-          :alt: libvirt-go-xml-module pipeline status
-
-   * - libvirt-snmp
-     - .. image:: https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-snmp/pipelines
-          :alt: libvirt-snmp pipeline status
-
-
-Testing
--------
-
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
-
-   * - Project
-     - Pipeline
-
-   * - libvirt-ci
-     - .. image:: https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-ci/pipelines
-          :alt: libvirt-ci pipeline status
-
-   * - libvirt-test-API
-     - .. image:: https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-test-API/pipelines
-          :alt: libvirt-test-API pipeline status
-
-   * - libvirt-tck
-     - .. image:: https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-tck/pipelines
-          :alt: libvirt-tck pipeline status
-
-
-Documentation / websites
-------------------------
-
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
-
-   * - Project
-     - Pipeline
-   * - libvirt-publican
-     - .. image:: https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-publican/pipelines
-          :alt: libvirt-publican pipeline status
-
-   * - libvirt-appdev-guide-python
-     - .. image:: https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines
-          :alt: libvirt-appdev-guide-python pipeline status
-
-   * - libvirt-wiki
-     - .. image:: https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-wiki/pipelines
-          :alt: libvirt-wiki pipeline status
-
-   * - virttools-planet
-     - .. image:: https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/virttools-planet/pipelines
-          :alt: virttools-planet pipeline status
-
-   * - virttools-web
-     - .. image:: https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/virttools-web/pipelines
-          :alt: virttools-web pipeline status
-
-
-Miscellaneous
--------------
-
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
-
-   * - Project
-     - Pipeline
-
-   * - libvirt-console-proxy
-     - .. image:: https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-console-proxy/pipelines
-          :alt: libvirt-console-proxy pipeline status
-
-   * - libvirt-designer
-     - .. image:: https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-designer/pipelines
-          :alt: libvirt-designer pipeline status
-
-   * - libvirt-devaddr
-     - .. image:: https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-devaddr/pipelines
-          :alt: libvirt-devaddr pipeline status
-
-   * - libvirt-sandbox
-     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-sandbox/pipelines
-          :alt: libvirt-sandbox pipeline status
-
-   * - libvirt-sandbox-image
-     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines
-          :alt: libvirt-sandbox-image pipeline status
-
-   * - libvirt-security-notice
-     - .. image:: https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-security-notice/pipelines
-          :alt: libvirt-security-notice pipeline status
diff --git a/docs/meson.build b/docs/meson.build
index cb70ef6084..fd9df047cb 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -34,6 +34,7 @@ docs_rst_files = [
   'bugs',
   'cgroups',
   'ci',
+  'ci-dashboard',
   'coding-style',
   'committer-guidelines',
   'compiling',
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:34 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:34 +0200
Subject: [libvirt PATCH 02/10] docs: Provide more information about the TCK
 test suite
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <51aed5f5bd8227f2901acefc617f3706ef032b0c.1657629865.git.eskultet@redhat.com>

Most importantly, how to get it, how install dependencies and how
to run it.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/testtck.rst | 92 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 81 insertions(+), 11 deletions(-)

diff --git a/docs/testtck.rst b/docs/testtck.rst
index 51de095657..19f1cc5726 100644
--- a/docs/testtck.rst
+++ b/docs/testtck.rst
@@ -2,6 +2,8 @@
 libvirt TCK : Technology Compatibility Kit
 ==========================================
 
+.. contents::
+
 The libvirt TCK provides a framework for performing testing of the integration
 between libvirt drivers, the underlying virt hypervisor technology, related
 operating system services and system configuration. The idea (and name) is
@@ -23,15 +25,83 @@ determine the level of compatibility of their platform, and evaluate whether it
 will meet their needs, and get awareness of any regressions that may have
 occurred since a previous test run.
 
-For more details you can look at:
-
--  The initial `mail from Daniel
-   Berrange <https://www.redhat.com/archives/libvir-list/2009-April/msg00176.html>`__
-   presenting the project.
--  The `page describing
-   VirtTCK <https://fedoraproject.org/wiki/Features/VirtTCK>`__ the inclusion of
-   libvirt-TCK as a Fedora Feature.
-
 Libvirt-TCK is maintained using `a GIT
-repository <https://gitlab.com/libvirt/libvirt-tck>`__, and comment, patches and
-reviews are carried on the `libvir-list <contact.html>`__ development list.
+repository <https://gitlab.com/libvirt/libvirt-tck>`__. GitLab is also the place
+where the whole TCK development workflow (issues, merge requests, comments)
+happens.
+
+Using TCK
+---------
+
+TCK can be used independently of the enviroment, i.e. both on your local host
+or in a VM. We strongly recommend using a VM for the tests as TCK might affect
+your current host setup, see `Running TCK`_.
+
+Installing dependencies
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Since TCK is based on libvirt Perl bindings, you'll need to have the proper
+version of the bindings installed for the version of libvirt you wish to test
+in order to be able execute the TCK test suite successfully. Additionally, a
+number of Perl dependencies will need to be installed as well, some will be
+available through the system package manager and some will likely need to be
+installed from CPAN (Perl's equivalent of Python's PyPI). Here's where
+`libvirt-ci's <https://gitlab.com/libvirt/libvirt-ci.git>`__ lcitool can help
+with preparing a test environment in a fresh VM, taking care of the
+dependencies along the way:
+
+::
+
+    $ lcitool install --target fedora-36 tck-fedora36 --wait
+
+would get you a new Fedora 36 VM named ``tck-fedora36``. Then
+
+::
+
+    $ lcitool update tck-fedora36 libvirt,libvirt-perl,libvirt-tck+runtime
+
+will install all the necessary dependencies to build libvirt, the corresponding
+Perl bindings and all TCK runtime dependencies to be able to execute the tests.
+We also recommend executing TCK using the Avocado framework as the test harness
+engine which means that you'll have to install Avocado in the test environment
+as well. You can get it either from
+`PyPI <https://pypi.org/project/avocado-framework/>`__ (recommended), or if
+you're on Fedora you can make use of the Avocado `module <https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/installing.html#installing-from-packages>`__.
+Using Avocado is not mandatory for the time being and you can skip it, but
+in the future we plan on making the TCK internal coupling with Avocado tighter.
+
+Running TCK
+~~~~~~~~~~~
+
+Once you have all the dependencies installed, you can then proceed with running
+as root the test suite as root (when running with Avocado):
+
+::
+
+    # avocado --config avocado.config run --tap - ./scripts/
+
+from the TCK's git root.
+
+
+If you don't want to install Avocado you can execute tests using the
+``libvirt-tck`` binary directly (again, from the git root). You'll need to pass
+a few options that Avocado takes care of:
+
+::
+
+    # PERL5LIB=./lib perl bin/libvirt-tck -c <path_to_config> --force ./scripts
+
+Note that running with root privileges is necessary since some tests need
+access to system resources or configs. This, along with the fact that some
+tests might affect the host system are good reasons to consider using a test VM
+as described above.
+
+Contributing a test
+-------------------
+
+We'd appreciate if you provided a functional test case whenever you're adding a
+new feature or fixing a bug in libvirt with the only complication being that
+in case you're adding a new public API then a Perl binding will have to be
+introduced first. After that, the best way to start is looking at some existing
+tests, copy-pasting one that fits your scenario the best and tweak the
+remaining bits.
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:35 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:35 +0200
Subject: [libvirt PATCH 03/10] docs: Provide an article on how to add a custom
 runner to the project
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <0bccf4deff93ffb630da626060b74d116e71b665.1657629865.git.eskultet@redhat.com>

Since running our functional test suite in GitLab cannot make use of
the shared resources it makes sense to document the process of adding
own HW to run the custom libvirt executor that powers the integration
suite. This article will likely make even more sense in the future with
GitLab severely cutting down on shared CI resources.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci-runners.rst | 86 +++++++++++++++++++++++++++++++++++++++++++++
 docs/meson.build    |  1 +
 2 files changed, 87 insertions(+)
 create mode 100644 docs/ci-runners.rst

diff --git a/docs/ci-runners.rst b/docs/ci-runners.rst
new file mode 100644
index 0000000000..fd5fdd121a
--- /dev/null
+++ b/docs/ci-runners.rst
@@ -0,0 +1,86 @@
+GitLab CI Custom (Specific) Runners
+===================================
+
+.. contents::
+
+GitLab's CI allows additional machines to be added to the project's or group's
+pool of runners (a runner is a machine running the GitLab's
+`gitlab-runner <https://gitlab.com/gitlab-org/gitlab-runner/>`__ agent service).
+Upon registering the runner the runner will then be ready accepting CI jobs
+depending on the pipeline configuration. Unlike the shared runners provided
+directly by GitLab's hosted SaaS specific runners are only used within the
+project/group which they were registered to, so you don't need to worry about
+forks burning CPU cycles on your precious HW resources.
+
+Understandably, we respect your decision to keep your runners only visible to
+your fork, but for the sake of the community we'd appreciate if you decided to
+register your runner with the upstream libvirt project instead. As we're only
+interested in running upstream test workloads (which you can even help
+defining) maintenance and security of the HW is your own responsibility and so
+we can promise to never ask for physical or remote access to the machine.
+
+Machine Setup Howto
+-------------------
+
+The following sections will guide you through the necessary setup of your
+specific GitLab runners.
+
+gitlab-runner setup and registration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The gitlab-runner agent needs to be installed on each machine that is supposed
+to run jobs. The association between a machine and a GitLab project
+happens with a registration token.  To find the registration token for
+your repository/project, navigate on GitLab's web UI to:
+
+ * Settings (the gears-like icon at the bottom of the left hand side
+   vertical toolbar), then
+ * CI/CD, then
+ * Runners, and click on the *Expand* button, then
+ * Under *Set up a specific Runner manually*, look for the value under
+   *And this registration token:*
+
+Note that in order to register a runner with the upstream libvirt project
+you'll need to work with the project maintainers to successfully register your
+machine.
+
+Following the `registration <https://docs.gitlab.com/runner/register/>`__
+process, it's necessary to configure the runner tags, and optionally other
+configurations on the GitLab UI.  Navigate to:
+
+ * Settings (the gears like icon), then
+ * CI/CD, then
+ * Runners, and click on the *Expand* button, then
+ * *Runners activated for this project*, then
+ * Click on the *Edit* icon (next to the *Lock* Icon)
+
+Don't forget to add a tag to your runner as these are used to route specific
+jobs to specific runners, e.g. if a job in ``ci/integration.yml`` looked like
+this ::
+
+    centos-stream-9-tests:
+    ...
+    variables:
+      # needed by libvirt-gitlab-executor
+      DISTRO: centos-stream-9
+      # can be overridden in forks to set a different runner tag
+      LIBVIRT_CI_INTEGRATION_RUNNER_TAG: my-vm-host
+    tags:
+    - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
+
+it would mean that the CentOS Stream 9 job would only be scheduled on runners
+bearing the 'my-vm-host' tag.
+
+Running integration tests
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Libvirt's integration tests run in a nested virtualization environment. So, if
+you wish to run integration tests on your bare-metal machine, you'll have to
+make use of GitLab's
+`custom executor <https://docs.gitlab.com/runner/executors/custom.html>`__
+feature which allows you to provision any kind of environment for a workload to
+run - in libvirt's case - a virtual machine. If you need any help with creating
+VM template images ready to run libvirt's integration test suite, have a look
+at the `libvirt-gitlab-executor <https://gitlab.com/libvirt/libvirt-custom-executor>`__
+project which encapsulates provisioning, execution, and teardown of the
+virtualized environments in a single tool.
diff --git a/docs/meson.build b/docs/meson.build
index fd9df047cb..0c7c54a75f 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -35,6 +35,7 @@ docs_rst_files = [
   'cgroups',
   'ci',
   'ci-dashboard',
+  'ci-runners',
   'coding-style',
   'committer-guidelines',
   'compiling',
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:36 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:36 +0200
Subject: [libvirt PATCH 04/10] docs: Provide an article on testing
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <57592e2914da8c618b11d0c6888e2c07664edcb7.1657629865.git.eskultet@redhat.com>

Currently we don't have much information on how testing is done in
libvirt and the little we have is scattered among multiple files. This
patch creates a common landing page containing all important bits about
testing in libvirt, providing links to respective sections which
deserve their own articles.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/meson.build |   1 +
 docs/testing.rst | 176 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+)
 create mode 100644 docs/testing.rst

diff --git a/docs/meson.build b/docs/meson.build
index 0c7c54a75f..6d61e18385 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -105,6 +105,7 @@ docs_rst_files = [
   'submitting-patches',
   'support',
   'testapi',
+  'testing',
   'testsuites',
   'testtck',
   'uri',
diff --git a/docs/testing.rst b/docs/testing.rst
new file mode 100644
index 0000000000..af0f334633
--- /dev/null
+++ b/docs/testing.rst
@@ -0,0 +1,176 @@
+=======
+Testing
+=======
+
+.. contents::
+
+Different types of tests are available to libvirt developers for testing a
+given libvirt release.
+
+Unit tests
+----------
+
+The unit test suite present in the source code is mainly used to test our
+XML parser/formatter, QEMU command line generator, QEMU capabilities probing,
+etc. It is run by developers before submitting patches upstream and is
+mandatory to pass for any contribution to be accepted upstream. One can run
+the test suite in the source tree with the following
+
+::
+
+    make check (libvirt 6.6.0 and older)
+
+::
+
+    ninja test (libvirt 6.7.0 and newer)
+
+
+Container builds
+----------------
+
+Technically speaking these are not tests in the common sense. However, usage of
+public container images to build libvirt in predefined and widely accessible
+environments makes it possible to expand our coverage across distros,
+architectures, toolchain flavors and library versions and as such is a very
+valuable marker when accepting upstream contributions. Therefore, it is
+recommended to run libvirt builds against your changes in various containers to
+either locally or by using GitLab's shared CI runners to make sure everything
+runs cleanly before submitting your patches. The images themselves come from
+libvirt's GitLab container registry, but this can be overriden if needed, see
+below.
+
+Registry
+~~~~~~~~
+
+Libvirt project has its container registry hosted by GitLab at
+``registry.gitlab.com/libvirt/libvirt`` which will automatically be
+used to pull in pre-built layers. This avoids the need to build all the
+containers locally using the Dockerfile recipes found in ``ci/containers/``.
+
+
+Running container builds with GitLab CI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As long as your GitLab account has CI minutes available, pipelines will run
+automatically on every branch push to your fork.
+
+Running container builds locally
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to run container builds locally, we have a ``helper`` script inside
+the ``ci`` directory that can pull, build, and test (if applicable) changes on
+your current local branch. It supports both the Docker and Podman runtimes
+with an automatic selection of whichever runtime is configured on your system.
+In case neither has been enabled/configured, please go through the following
+prerequisites.
+
+Docker Prerequisites
+~~~~~~~~~~~~~~~~~~~~
+
+Install "docker" with the system package manager and start the Docker service
+on your development machine, then make sure you have the privilege to run
+Docker commands. Typically it means setting up passwordless ``sudo docker``
+command or login as root. For example:
+
+.. code::
+
+  $ sudo yum install docker
+  $ # or `apt-get install docker` for Ubuntu, etc.
+  $ sudo systemctl start docker
+  $ sudo docker ps
+
+The last command should print an empty table, to verify the system is ready.
+
+An alternative method to set up permissions is by adding the current user to
+"docker" group and making the docker daemon socket file (by default
+``/var/run/docker.sock``) accessible to the group:
+
+.. code::
+
+  $ sudo groupadd docker
+  $ sudo usermod $USER -a -G docker
+  $ sudo chown :docker /var/run/docker.sock
+
+Note that any one of above configurations makes it possible for the user to
+exploit the whole host with Docker bind mounting or other privileged
+operations.  So only do it on development machines.
+
+Podman Prerequisites
+~~~~~~~~~~~~~~~~~~~~
+
+Install "podman" with the system package manager.
+
+.. code::
+
+  $ sudo dnf install podman
+  $ podman ps
+
+The last command should print an empty table, to verify the system is ready.
+
+Examples of executing local container builds
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All of the following examples will utilize ``helper`` script mentioned earlier
+sections. Let's start with the basics - listing available container images in
+the default libvirt registry:
+
+::
+
+    $ cd <libvirt_git>/ci
+    $ ./helper --help
+    $ ./helper list-images
+    Available x86 container images:
+
+    ...
+    alpine-edge
+    fedora-rawhide
+    ...
+
+    Available cross-compiler container images:
+
+    ...
+    debian-sid-cross-s390x
+    fedora-rawhide-cross-mingw32
+    fedora-rawhide-cross-mingw64
+    ...
+
+Now let's say one would want to build their local libvirt changes on Alpine
+Edge using their own GitLab's registry container. They'd then proceed with
+
+::
+
+    $ ci/helper build --image-prefix registry.gitlab.com/<user>/libvirt/ci- alpine-edge
+
+Finally, it would be nice if one could get an interactive shell inside the
+test environment to debug potential build issues. This can be achieved with the
+following:
+
+::
+
+    $ ci/helper shell alpine-edge
+
+
+Integration tests
+-----------------
+
+There are a few frameworks for writing and running functional tests in libvirt
+with TCK being the one that runs in our upstream CI.
+
+-  the `TCK test suite <testtck.html>`__ is a functional test suite implemented
+   using the `Perl bindings <https://search.cpan.org/dist/Sys-Virt/>`__ of
+   libvirt. This is the recommended framework to use for writing upstream
+   functional tests at the moment. You can start by cloning the
+   `TCK git repo <https://gitlab.com/libvirt/libvirt-tck>`__.
+
+-  the `Avocado VT <https://github.com/avocado-framework/avocado-vt>`__ test
+   suite with the libvirt plugin is another framework implementing functional
+   testing utilizing the Avocado test framework underneath. Although written in
+   Python, the vast majority of the tests are exercising libvirt through the
+   command line client ``virsh``.
+
+-  the `libvirt-test-API <testapi.html>`__ is also a functional test suite, but
+   implemented using the `Python bindings <python.html>`__ of libvirt.
+   Unfortunately this framework is the least recommended one as it's largely
+   unmaintained and may be completely deprecated in the future in favour of TCK.
+   You can get it by cloning the
+   `git repo <https://gitlab.com/libvirt/libvirt-test-API/>`__.
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:37 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:37 +0200
Subject: [libvirt PATCH 05/10] docs: Replace testsuites article with the new
 'testing' article
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <bc890d3afa1fa0a1cc3a81fab7ce95b76f461cb3.1657629865.git.eskultet@redhat.com>

The new article provides more in-depth information on testing options
in libvirt.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/docs.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/docs.rst b/docs/docs.rst
index 9fd8b7c37e..b17d73743a 100644
--- a/docs/docs.rst
+++ b/docs/docs.rst
@@ -154,10 +154,8 @@ Project development
 `API extensions <api_extension.html>`__
    Adding new public libvirt APIs
 
-`Functional testing <testsuites.html>`__
-   Testing libvirt with
-   `TCK test suite <testtck.html>`__ and
-   `Libvirt-test-API <testapi.html>`__
+`Testing <testing.html>`__
+   Details various types of testing available for libvirt
 
 `New repo setup <newreposetup.html>`__
    Procedure for configuring new git repositories for libvirt
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:38 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:38 +0200
Subject: [libvirt PATCH 06/10] docs: Drop the testsuites article
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <55365b783f38e3bcdaeb3001a61f22631a3febbe.1657629865.git.eskultet@redhat.com>

The article was replaced with a new one in previous commit, so we don't
need this one anymore.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/meson.build    |  1 -
 docs/testsuites.rst | 37 -------------------------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 docs/testsuites.rst

diff --git a/docs/meson.build b/docs/meson.build
index 6d61e18385..0b16d64488 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -106,7 +106,6 @@ docs_rst_files = [
   'support',
   'testapi',
   'testing',
-  'testsuites',
   'testtck',
   'uri',
   'windows',
diff --git a/docs/testsuites.rst b/docs/testsuites.rst
deleted file mode 100644
index 4fc733e615..0000000000
--- a/docs/testsuites.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-===========
-Test suites
-===========
-
-There is a few test suites available to developers for testing a given version
-of libvirt:
-
--  the internal test suite: present in the source code, it is run by developers
-   before submitting patches upstream, it is also suggested to have it run and
-   pass as part of the packaging process for distributions. It is run by
-   launching:
-
-   ::
-
-      make check (libvirt 6.6.0 and older)
-
-   ::
-
-      ninja test (libvirt 6.7.0 and newer)
-
-   in a source tree after compilation has finished. It doesn't really make
-   functional testing but checks that large portions of the code not interacting
-   directly with virtualization functions properly.
-
--  the `TCK test suite <testtck.html>`__ is a functional test suite implemented
-   using the `Perl bindings <https://search.cpan.org/dist/Sys-Virt/>`__ of
-   libvirt. It is available separately as a
-   `download <ftp://libvirt.org/libvirt/tck/>`__, as a
-   `package <https://rpmfind.net/linux/rpm2html/search.php?query=libvirt-tck>`__
-   in Fedora distributions, but best is probably to get the `version from
-   GIT <https://gitlab.com/libvirt/libvirt-tck>`__.
-
--  the `libvirt-test-API <testapi.html>`__ is also a functional test suite, but
-   implemented using the `Python bindings <python.html>`__ of libvirt. It is
-   available separately as a
-   `download <ftp://libvirt.org/libvirt/libvirt-test-API/>`__, or directly get
-   the `version from GIT <https://gitlab.com/libvirt/libvirt-test-API/>`__.
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:39 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:39 +0200
Subject: [libvirt PATCH 07/10] docs: Change the CI headline from "CI Testing"
 to "CI"
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <89f21ed24a7931b958a97312f2678c1905205324.1657629865.git.eskultet@redhat.com>

It's not just strategy the master CI article talks (or will talk in the
future) about.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/docs.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs.rst b/docs/docs.rst
index b17d73743a..8ca0afdc1a 100644
--- a/docs/docs.rst
+++ b/docs/docs.rst
@@ -136,8 +136,8 @@ Project development
 `Project strategy <strategy.html>`__
    Sets a vision for future direction & technical choices
 
-`CI Testing <ci.html>`__
-   Details of the Continuous Integration testing strategy
+`CI <ci.html>`__
+   Details on our Continuous Integration
 
 `Bug reports <bugs.html>`__
    How and where to report bugs and request features
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:40 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:40 +0200
Subject: [libvirt PATCH 08/10] docs: ci: Add info about the two major types of
 jobs our CI runs
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <fa151581bc5091dcec4486c6d81b4b914685cf9f.1657629865.git.eskultet@redhat.com>

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci.rst | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docs/ci.rst b/docs/ci.rst
index d5282c4d25..bef023c521 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -8,6 +8,9 @@ The libvirt project uses GitLab CI for automated testing.
 `Here's <ci-dashboard.html>`__ our CI dashboard which shows the current status
 of our pipelines.
 
+Libvirt builds
+==============
+
 Linux builds and cross-compiled Windows builds happen on GitLab CI's shared
 runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
 <https://cirrus-ci.com/>`_ jobs behind the scenes.
@@ -15,11 +18,28 @@ runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
 Most of the tooling used to build CI pipelines is maintained as part of the
 `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci>`_ subproject.
 
+Integration tests
+=================
 
+Integration tests in our CI pipelines require dedicated HW which is not
+available to forks, see `GitLab CI Custom Runners <ci-runners.html>`__.
+Therefore, in order to execute the integration tests as part of your libvirt
+fork's GitLab CI you'll need to provide your own runner. You'll also need to
+set a few CI variables to run the integration tests as part of the CI pipeline,
+see below.
 
+GitLab CI variables
+-------------------
 
+* ``LIBVIRT_CI_INTEGRATION`` - enables integration test runs manually or in forks
+* ``LIBVIRT_CI_INTEGRATION_RUNNER_TAG`` - overrides the upstream runner tag on the
 
+Retrieving test logs
+--------------------
 
+In case the integration test suite fails in our CI pipelines, a job artifact is
+generated containing Avocado logs, libvirt debug logs, and the latest traceback
+(if one was produced during a daemon's execution).
 
 
 
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:42 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:42 +0200
Subject: [libvirt PATCH 10/10] docs: ci: Add a brief section on how to run the
 CI workload locally
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <ba43f9e5431ad12aecaa1ecaae2493402626c177.1657629865.git.eskultet@redhat.com>

This is just a glue to the testing article introduced in previous
commits.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/ci.rst b/docs/ci.rst
index ea1b839eac..515a02a6f6 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -97,4 +97,8 @@ Assuming there is agreement to the change you wish to make then
 
     $ lcitool manifest
 
+Running CI workloads locally
+============================
 
+If you're interested in running the CI test workloads locally, please read
+our `testing <testing.html>`__ guide.
-- 
2.36.1


From eskultet at redhat.com  Tue Jul 12 12:44:41 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 12 Jul 2022 14:44:41 +0200
Subject: [libvirt PATCH 09/10] docs: ci: Add a section on how to add a new
 platform to libvirt CI
In-Reply-To: <cover.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
Message-ID: <44e6584d63af4e9f1c6a25c3fa9a4200f6dabea7.1657629865.git.eskultet@redhat.com>

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci.rst | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/docs/ci.rst b/docs/ci.rst
index bef023c521..ea1b839eac 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -41,21 +41,60 @@ In case the integration test suite fails in our CI pipelines, a job artifact is
 generated containing Avocado logs, libvirt debug logs, and the latest traceback
 (if one was produced during a daemon's execution).
 
+Adding new OS platforms OR build pre-requisites
+===============================================
 
+Since all of the Dockerfiles libvirt uses for CI have been generated by ``lcitool``
+provided by the `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci.git>`__ project,
+most relevant changes will need to be introduced to ``lcitool`` first.
 
+In cases where ``libvirt-ci`` does not know about the OS distro/build
+pre-requisite that is desired to be tested, proceed with the following:
 
+ * Send a mail regarding your desired build/coverage change to libvir-list
 
+   Note that in case you're looking into adding a new OS platform there are
+   limited CI compute resources available to libvirt, so the cost/benefit
+   trade-off of adding new OS distros needs to be considered and
+   is subject to a discussion on the mailing list.
 
+ * File an issue at https://gitlab.com/libvirt/libvirt-ci/-/issues
+   pointing to the libvir-list mail thread in the archives.
 
+   This alerts other people who might be interested in the work
+   to avoid duplication, as well as to get feedback from libvirt-ci
+   maintainers on any tips to ease the addition.
 
+Assuming there is agreement to the change you wish to make then
 
+ #. Fork the ``libvirt-ci`` project on gitlab
 
+ #.
+    * If adding a new OS distro, add metadata under
+      ``guests/lcitool/lcitool/ansible/group_vars/``
+      for the new OS distro. There might be code changes required if
+      the OS distro uses a package format not currently known. The
+      ``libvirt-ci`` maintainers can advise on this when the issue
+      is file. Edit the ``mappings.yml`` file to update all the existing package
+      entries, providing details of the new OS distro **OR**
 
+    * If **NOT** adding a new OS distro, simply edit the ``mappings.yml`` file
+      to provide a distro-agnostic mapping for the pre-requisite you're adding
 
+ #. Commit the ``mappings.yml`` change and submit a merge request to
+    the ``libvirt-ci`` project
 
+ #. CI pipeline will run to validate that the changes to ``mappings.yml``
+    are correct, by attempting to install the newly listed package on
+    all OS distributions supported by ``libvirt-ci``
 
+ #. Once the merge request is accepted, go back to libvirt and update the
+    ``ci/manifest.yml`` file to reflect your change
 
+ #. From the root of the libvirt git repository run
 
+::
 
+    $ lcitool manifest
 
 
-- 
2.36.1


From mprivozn at redhat.com  Tue Jul 12 13:13:29 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 15:13:29 +0200
Subject: [PATCH 0/5] conf: Introduce @guestReset to hostdev's <source/>
Message-ID: <cover.1657631390.git.mprivozn@redhat.com>

There are couple of examples where this knob would be useful:

https://bugs.launchpad.net/qemu/+bug/1846451

(look for those cmd line passthrough hacks), and one pretty recent
request:

https://listman.redhat.com/archives/libvir-list/2022-June/232611.html

The last patch uses info from Kraxel's patch (which he posted after our
private discussion):

https://lists.gnu.org/archive/html/qemu-devel/2022-07/msg01733.html

Michal Pr?vozn?k (5):
  tests: Update hostdev-usb-* hostdev-pci-* xml2xml and xml2argv tests
  conf: Introduce @guestReset to hostdev's <source/>
  qemu_capabilities: Track usb-host.guest-resets-all capability
  qemu_validate: Validate that QEMU's capable of guestReset
  qemu: Generate cmd line for guestReset

 docs/formatdomain.rst                         | 15 +++++++-
 src/conf/domain_conf.c                        | 18 +++++++++
 src/conf/domain_conf.h                        | 13 +++++++
 src/conf/schemas/domaincommon.rng             |  9 +++++
 src/qemu/qemu_capabilities.c                  |  2 +
 src/qemu/qemu_capabilities.h                  |  1 +
 src/qemu/qemu_command.c                       | 21 ++++++++++
 src/qemu/qemu_validate.c                      |  8 ++++
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1 +
 .../caps_3.1.0.x86_64.xml                     |  1 +
 .../caps_4.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1 +
 .../caps_4.0.0.riscv32.xml                    |  1 +
 .../caps_4.0.0.riscv64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  1 +
 .../caps_4.0.0.x86_64.xml                     |  1 +
 .../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 +
 .../caps_5.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |  1 +
 .../caps_5.0.0.riscv64.xml                    |  1 +
 .../caps_5.0.0.x86_64.xml                     |  1 +
 .../caps_5.1.0.x86_64.xml                     |  1 +
 .../caps_5.2.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |  1 +
 .../caps_5.2.0.riscv64.xml                    |  1 +
 .../caps_5.2.0.x86_64.xml                     |  1 +
 .../caps_6.0.0.aarch64.xml                    |  1 +
 .../caps_6.0.0.x86_64.xml                     |  1 +
 .../caps_6.1.0.x86_64.xml                     |  1 +
 .../caps_6.2.0.aarch64.xml                    |  1 +
 .../caps_6.2.0.x86_64.xml                     |  1 +
 .../caps_7.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
 .../caps_7.0.0.x86_64.xml                     |  1 +
 .../caps_7.1.0.x86_64.xml                     |  1 +
 .../hostdev-pci-address-device.args           | 34 -----------------
 ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-pci-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-pci-address.args | 33 ----------------
 .../hostdev-pci-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-pci-address.xml  |  2 +-
 .../hostdev-usb-address-device-boot.args      | 34 -----------------
 ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device-boot.xml       |  2 +-
 .../hostdev-usb-address-device.args           | 34 -----------------
 ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-usb-address.args | 33 ----------------
 .../hostdev-usb-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-usb-address.xml  |  4 +-
 tests/qemuxml2argvtest.c                      | 10 ++---
 ... => hostdev-pci-address.x86_64-latest.xml} |  7 +++-
 ... => hostdev-usb-address.x86_64-latest.xml} |  9 +++--
 tests/qemuxml2xmltest.c                       |  4 +-
 58 files changed, 329 insertions(+), 187 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%)
 rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (83%)

-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 13:13:30 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 15:13:30 +0200
Subject: [PATCH 1/5] tests: Update hostdev-usb-* hostdev-pci-* xml2xml and
 xml2argv tests
In-Reply-To: <cover.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
Message-ID: <6e989f371cbb3f8a3644230d684e1d6e8864fc9b.1657631390.git.mprivozn@redhat.com>

Currently, we have bunch of PCI/USB tests cases for
qemuxml2argvtest and qemuxml2xmltest but all of them run without
any capabilities. This makes is needlessly complicated when
trying to extend them. Switch to DO_TEST_CAPS_LATEST().

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 .../hostdev-pci-address-device.args           | 34 -----------------
 ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-pci-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-pci-address.args | 33 ----------------
 .../hostdev-pci-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-pci-address.xml  |  2 +-
 .../hostdev-usb-address-device-boot.args      | 34 -----------------
 ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device-boot.xml       |  2 +-
 .../hostdev-usb-address-device.args           | 34 -----------------
 ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-usb-address.args | 33 ----------------
 .../hostdev-usb-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-usb-address.xml  |  2 +-
 tests/qemuxml2argvtest.c                      | 10 ++---
 ... => hostdev-pci-address.x86_64-latest.xml} |  7 +++-
 ... => hostdev-usb-address.x86_64-latest.xml} |  7 +++-
 tests/qemuxml2xmltest.c                       |  4 +-
 19 files changed, 210 insertions(+), 184 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%)
 rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (85%)

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
deleted file mode 100644
index 4c39457ae5..0000000000
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
new file mode 100644
index 0000000000..a0b6777ce2
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest2,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
index 7a99fc8444..3fc4d12f7e 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
deleted file mode 100644
index a985ff9dc1..0000000000
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
new file mode 100644
index 0000000000..fe011d5f8a
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest2,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.xml b/tests/qemuxml2argvdata/hostdev-pci-address.xml
index 5f8090336f..f35b8394f7 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
deleted file mode 100644
index 7e72951fd1..0000000000
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ /dev/null
@@ -1,34 +0,0 @@
-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,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
new file mode 100644
index 0000000000..2a5a085231
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
@@ -0,0 +1,38 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bootindex":1,"bus":"usb.0","port":"1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
index ac1360f87f..a3c0618e37 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
deleted file mode 100644
index c4003864c4..0000000000
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ /dev/null
@@ -1,34 +0,0 @@
-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,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
new file mode 100644
index 0000000000..30809a076c
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
@@ -0,0 +1,38 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
index 9027564584..f63ad30950 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
deleted file mode 100644
index a5bf6263d4..0000000000
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ /dev/null
@@ -1,33 +0,0 @@
-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,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
new file mode 100644
index 0000000000..f59c463f5e
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
@@ -0,0 +1,37 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"1"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
index 7d0c338311..03c802a532 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a99b44bf2d..5b40a0d7f5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1914,12 +1914,12 @@ mymain(void)
     DO_TEST_CAPS_LATEST("fs9p");
     DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x");
 
-    DO_TEST_NOCAPS("hostdev-usb-address");
-    DO_TEST_NOCAPS("hostdev-usb-address-device");
-    DO_TEST_NOCAPS("hostdev-usb-address-device-boot");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address-device");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address-device-boot");
     DO_TEST_PARSE_ERROR_NOCAPS("hostdev-usb-duplicate");
-    DO_TEST("hostdev-pci-address", QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST("hostdev-pci-address-device", QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST("hostdev-pci-address");
+    DO_TEST_CAPS_LATEST("hostdev-pci-address-device");
     DO_TEST_PARSE_ERROR("hostdev-pci-duplicate",
                         QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-vfio",
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/hostdev-pci-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
index 9ba3dfac45..84d9660316 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
@@ -8,19 +8,22 @@
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</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 type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/hostdev-usb-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
index e4a1f798b2..e5e3620971 100644
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
@@ -8,19 +8,22 @@
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 71bce98c17..58929b68c1 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -526,8 +526,8 @@ mymain(void)
 
     DO_TEST_NOCAPS("channel-unix-source-path");
 
-    DO_TEST_NOCAPS("hostdev-usb-address");
-    DO_TEST_NOCAPS("hostdev-pci-address");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address");
+    DO_TEST_CAPS_LATEST("hostdev-pci-address");
     DO_TEST("hostdev-pci-address-unassigned", QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 13:13:32 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 15:13:32 +0200
Subject: [PATCH 3/5] qemu_capabilities: Track usb-host.guest-resets-all
 capability
In-Reply-To: <cover.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
Message-ID: <9b8a0b2d5a8acc3c1f946690419b49fb906408e7.1657631390.git.mprivozn@redhat.com>

We will need two attributes of usb-host device to set:
guest-reset and guest-resets-all. The former was introduced in
QEMU v4.0.0-rc0~56^2 and the other in v4.2.0-rc1~9^2. Hence,
track the latter only as it's only starting from that commit when
QEMU has both attributes.

Our qemucapabilitiesdata are wrong though, as they enable the
capability for quite old releases (for instance 3.1.0 when
neither of the attributes existed). But this is because I didn't
use actual QEMU to refresh .replies files in v6.9.0-rc1~457. I
just blindly copied particular reply around. But that's okay, it
doesn't really hurt anything.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 2 ++
 src/qemu/qemu_capabilities.h                      | 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 +
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
 33 files changed, 34 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2c3be3ecec..2d352f406b 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
+              "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
     );
 
 
@@ -1459,6 +1460,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPCIeRootPort[] =
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBHost[] = {
     { "hostdevice", QEMU_CAPS_USB_HOST_HOSTDEVICE, NULL },
+    { "guest-resets-all", QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHostBridge[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6f35ba1485..a409c1272c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
+    QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
 
     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 cc6e75884b..b4acdebb37 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -135,6 +135,7 @@
   <flag name='cpu-max'/>
   <flag name='input-linux'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>3001000</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 27be36f0ab..d62e543459 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -179,6 +179,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>3001000</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 7e0b8fbddf..cde5b4f54c 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -147,6 +147,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 19bbbd1de3..c8726cbb22 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -152,6 +152,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 ef6f04f54b..81dcfaa5cb 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -144,6 +144,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 7c65aff290..ee855a1077 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -144,6 +144,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 9b5ed96ba3..a0c186c41f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -114,6 +114,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 3cf6a66389..d0fbb90c89 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -187,6 +187,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 5daa7bda75..363bcf0739 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -194,6 +194,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 162ace7b2b..875e491581 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -162,6 +162,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>4002000</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 7c5275210b..428ecd4f42 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -159,6 +159,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>4002000</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 ce5b782afd..725745593c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -127,6 +127,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>4002000</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 9ee4c0534d..6a54c44d79 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -205,6 +205,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 29ee31473f..35998cabf0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -174,6 +174,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 1fdec901a6..b8ddf2e9a8 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -180,6 +180,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 3b58e7fece..c49c258255 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -166,6 +166,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index bee5a84cf9..ce297f2ef5 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -214,6 +214,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 070f64cb1c..a49650cbcc 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -218,6 +218,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 8e17532f3a..42a4418a08 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -181,6 +181,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index df02e264d7..d0dd058743 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -185,6 +185,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 7cb4383693..25339f86d9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -171,6 +171,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index cad4ed40e6..4ff03dbead 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -222,6 +222,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 4b4cc2d3aa..2d861da97b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -189,6 +189,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 8c61bf8a84..38acee5f18 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -231,6 +231,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index afd8f606eb..b03c6bfc24 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -236,6 +236,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 86fc46918f..942c0ba169 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -201,6 +201,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 19605d93ae..32f226acbd 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -238,6 +238,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index e24e2235fb..f4d7cbdd10 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -209,6 +209,7 @@
   <flag name='virtio-iommu.boot-bypass'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 83e0f50e3a..2f895294de 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -213,6 +213,7 @@
   <flag name='virtio-iommu.boot-bypass'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 05f844fd5b..17ea778d38 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -243,6 +243,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 3707d9b7c9..5f5c839fea 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -244,6 +244,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
   <flag name='iothread.thread-pool-max'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 13:13:31 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 15:13:31 +0200
Subject: [PATCH 2/5] conf: Introduce @guestReset to hostdev's <source/>
In-Reply-To: <cover.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
Message-ID: <32dfa9ec0598eb84267672a34442b1592524baa6.1657631390.git.mprivozn@redhat.com>

Some USB devices have a buggy firmware that either crashes on
device reset, or make the device unusable in some other way.
Fortunately, QEMU offers a way to skip device reset either
completely, or if device is not initialized yet. Expose this
ability to users under:

    <hostdev mode='subsystem' type='usb'>
      <source guestReset='off'/>
    </hostdev>

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomain.rst                          | 15 ++++++++++++++-
 src/conf/domain_conf.c                         | 18 ++++++++++++++++++
 src/conf/domain_conf.h                         | 13 +++++++++++++
 src/conf/schemas/domaincommon.rng              |  9 +++++++++
 tests/qemuxml2argvdata/hostdev-usb-address.xml |  2 +-
 .../hostdev-usb-address.x86_64-latest.xml      |  2 +-
 6 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 89b627f4bd..3ea094e64c 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -4051,7 +4051,7 @@ for PCI (KVM only) and 1.0.6 for SCSI (KVM only)` :
    ...
    <devices>
      <hostdev mode='subsystem' type='usb'>
-       <source startupPolicy='optional'>
+       <source startupPolicy='optional' guestReset='off'>
          <vendor id='0x1234'/>
          <product id='0xbeef'/>
        </source>
@@ -4231,6 +4231,19 @@ or:
       optional  drop if missing at any start attempt
       ========= =====================================================================
 
+      :since:`Since 8.6.0`, the ``source`` element can contain ``guestReset``
+      attribute with the following value:
+
+      ============= =====================================================
+      off           all guest initiated device reset requests are ignored
+      uninitialized device request is ignored if device is initialized,
+                    otherwise reset is performed
+      on            device is reset on every guest initiated request
+      ============= =====================================================
+
+      This attribute can be helpful when assigning an USB device with a
+      firmware that crashes on reset.
+
    ``pci``
       PCI devices can only be described by their ``address``.
       :since:`Since 6.8.0 (Xen only)` , the ``source`` element of a PCI device
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b639022396..ced25286bd 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1042,6 +1042,14 @@ VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIProtocol,
               "iscsi",
 );
 
+VIR_ENUM_IMPL(virDomainHostdevSubsysUSBGuestReset,
+              VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_LAST,
+              "default",
+              "off",
+              "uninitialized",
+              "on",
+);
+
 VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIHostProtocol,
               VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST,
               "none",
@@ -5489,6 +5497,11 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
         return -1;
     virTristateBoolToBool(autoAddress, &usbsrc->autoAddress);
 
+    if (virXMLPropEnum(node, "guestReset",
+                       virDomainHostdevSubsysUSBGuestResetTypeFromString,
+                       VIR_XML_PROP_NONZERO, &usbsrc->guestReset) < 0)
+        return -1;
+
     /* Product can validly be 0, so we need some extra help to determine
      * if it is uninitialized */
     vendorNode = virXPathNode("./vendor", ctxt);
@@ -22989,6 +23002,11 @@ virDomainHostdevDefFormatSubsysUSB(virBuffer *buf,
     if (def->missing && !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
         virBufferAddLit(&sourceAttrBuf, " missing='yes'");
 
+    if (usbsrc->guestReset) {
+        virBufferAsprintf(&sourceAttrBuf, " guestReset='%s'",
+                          virDomainHostdevSubsysUSBGuestResetTypeToString(usbsrc->guestReset));
+    }
+
     if (usbsrc->vendor) {
         virBufferAsprintf(&sourceChildBuf, "<vendor id='0x%.4x'/>\n", usbsrc->vendor);
         virBufferAsprintf(&sourceChildBuf, "<product id='0x%.4x'/>\n", usbsrc->product);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c56b84683c..90de50c12f 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -233,6 +233,17 @@ typedef enum {
 
 VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol);
 
+typedef enum {
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_DEFAULT = 0,
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_OFF,           /* reset forbidden */
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_UNINITIALIZED, /* reset iff uninitialized */
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_ON,            /* reset allowed */
+
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_LAST
+} virDomainHostdevSubsysUSBGuestReset;
+
+VIR_ENUM_DECL(virDomainHostdevSubsysUSBGuestReset);
+
 struct _virDomainHostdevSubsysUSB {
     bool autoAddress; /* bus/device were filled automatically based
                          on vendor/product */
@@ -241,6 +252,8 @@ struct _virDomainHostdevSubsysUSB {
 
     unsigned vendor;
     unsigned product;
+
+    virDomainHostdevSubsysUSBGuestReset guestReset;
 };
 
 struct _virDomainHostdevSubsysPCI {
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index da2fb0d5cb..faa2561665 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5936,6 +5936,15 @@
       <optional>
         <ref name="startupPolicy"/>
       </optional>
+      <optional>
+        <attribute name="guestReset">
+          <choice>
+            <value>off</value>
+            <value>uninitialized</value>
+            <value>on</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <group>
           <ref name="usbproduct"/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
index 03c802a532..50c02f9b0e 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml
@@ -26,7 +26,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <hostdev mode='subsystem' type='usb' managed='no'>
-      <source>
+      <source guestReset='uninitialized'>
         <address bus='14' device='6'/>
       </source>
     </hostdev>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
index e5e3620971..2e927252a8 100644
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='usb' managed='no'>
-      <source>
+      <source guestReset='uninitialized'>
         <address bus='14' device='6'/>
       </source>
     </hostdev>
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 13:13:34 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 15:13:34 +0200
Subject: [PATCH 5/5] qemu: Generate cmd line for guestReset
In-Reply-To: <cover.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
Message-ID: <937bb17dcb53d36cb7036c1589b117ce7e4cf54f.1657631390.git.mprivozn@redhat.com>

QEMU offers two attributes for handling reset requests of an USB
host device: guest-reset and guest-resets-all. When combined they
act as follows:

1) guest-reset=false
   The guest is not allowed to reset the physical USB device.

2) guest-reset=true,guest-resets-all=false
   The guest is allowed to reset the device when it is not yet
   initialized (aka no USB bus address assigned). Usually this results
   in one guest reset being allowed. This is the default behavior.

3) guest-reset=true,guest-resets-all=true
   The guest is allowed to reset the device as it pleases.

Now, there's a clear 1:1 mapping with our representation of
guestReset, so generating cmd line is trivial.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_command.c                       | 21 +++++++++++++++++++
 .../hostdev-usb-address.x86_64-latest.args    |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b307d3139c..262fffe5fe 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5001,6 +5001,8 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
     unsigned int hostbus = 0;
     unsigned int hostaddr = 0;
     g_autofree char *hostdevice = NULL;
+    virTristateSwitch guestReset = VIR_TRISTATE_SWITCH_ABSENT;
+    virTristateSwitch guestResetsAll = VIR_TRISTATE_SWITCH_ABSENT;
 
     if (!dev->missing) {
         if (usbsrc->bus == 0 && usbsrc->device == 0) {
@@ -5018,6 +5020,23 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
         }
     }
 
+    switch (usbsrc->guestReset) {
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_OFF:
+        guestReset = VIR_TRISTATE_SWITCH_OFF;
+        break;
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_UNINITIALIZED:
+        guestReset = VIR_TRISTATE_SWITCH_ON;
+        guestResetsAll = VIR_TRISTATE_SWITCH_OFF;
+        break;
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_ON:
+        guestReset = VIR_TRISTATE_SWITCH_ON;
+        guestResetsAll = VIR_TRISTATE_SWITCH_ON;
+        break;
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_DEFAULT:
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_LAST:
+        break;
+    }
+
     if (virJSONValueObjectAdd(&props,
                               "s:driver", "usb-host",
                               "S:hostdevice", hostdevice,
@@ -5025,6 +5044,8 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
                               "p:hostaddr", hostaddr,
                               "s:id", dev->info->alias,
                               "p:bootindex",  dev->info->bootIndex,
+                              "T:guest-reset", guestReset,
+                              "T:guest-resets-all", guestResetsAll,
                               NULL) < 0)
         return NULL;
 
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
index f59c463f5e..978e6a6e6d 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
@@ -32,6 +32,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","guest-reset":true,"guest-resets-all":false,"bus":"usb.0","port":"1"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 13:13:33 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 15:13:33 +0200
Subject: [PATCH 4/5] qemu_validate: Validate that QEMU's capable of guestReset
In-Reply-To: <cover.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
Message-ID: <5058101f1f541d12a0775fc4030f8a878e9d3f22.1657631390.git.mprivozn@redhat.com>

Now that we have a capability, validate that the QEMU we are
talking to has everything we need for guestReset.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_validate.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 39210ba65b..764d5b029e 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2543,6 +2543,14 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev,
     if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
         switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) {
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+            if (hostdev->source.subsys.u.usb.guestReset &&
+                !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("guestReset is not supported with this version of QEMU"));
+                return -1;
+            }
+            break;
+
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
             break;
 
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 13:17:17 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Tue, 12 Jul 2022 15:17:17 +0200
Subject: Qemu guest-reset option on device_add
In-Reply-To: <CA+9vR5E1dmUMxPEOkVOWjW1ADhsCakTrgmy_3=SJyK=5kokHwA@mail.gmail.com>
References: <CA+9vR5EV4=mv4H+1Ja2TZXnijJeaHV3-2AGeAso-yp23qpzbRw@mail.gmail.com>
 <37e4f82c-057f-32ae-105d-f10898f79471@redhat.com>
 <CA+9vR5E1dmUMxPEOkVOWjW1ADhsCakTrgmy_3=SJyK=5kokHwA@mail.gmail.com>
Message-ID: <6a7b7334-e479-d081-59dc-6d7a27288d9d@redhat.com>

On 7/6/22 17:55, Simon Fairweather wrote:
> Hi Michal, If you are able to implement the feature that would be great.
> 
> Regards
> Simon.

Hey, I've posted patches here:

https://listman.redhat.com/archives/libvir-list/2022-July/232756.html

I'm not sure whether you want to build libvirt from git only to test
them, or wait until release, but in general, the <source/> element
gained new 'guestReset' attribute and you could use it like this:

<hostdev mode='subsystem' type='usb' managed='yes'>
  <source guestReset='no'>
    <vendor>0x05ac</vendor>
    <product>0x12a8</product>
  </source>
</hostdev>

Michal


From mprivozn at redhat.com  Tue Jul 12 14:25:45 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 16:25:45 +0200
Subject: [PATCH 0/4] qemu: Report supported TPM version in domcaps
Message-ID: <cover.1657635928.git.mprivozn@redhat.com>

*** BLURB HERE ***

Michal Pr?vozn?k (4):
  docs: Document TPM portion of domcaps
  virtpm: Introduce TPM-1.2 and TPM-2.0 capabilieis
  domcaps: Introduce TPM backendVersion
  qemu: Report supported TPM version in domcaps

 docs/formatdomaincaps.rst      | 36 ++++++++++++++++++++++++++++++++++
 src/conf/domain_capabilities.c |  1 +
 src/conf/domain_capabilities.h |  1 +
 src/qemu/qemu_capabilities.c   | 15 +++++++++++---
 src/util/virtpm.c              |  2 ++
 src/util/virtpm.h              |  2 ++
 6 files changed, 54 insertions(+), 3 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 14:25:47 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 16:25:47 +0200
Subject: [PATCH 2/4] virtpm: Introduce TPM-1.2 and TPM-2.0 capabilieis
In-Reply-To: <cover.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
Message-ID: <1f6c74c1996026fb6e7d5442b624d834102d44c4.1657635928.git.mprivozn@redhat.com>

These new capabilities will be used only to track whether
swtpm_setup is capable of TPM-1.2 and/or TPM-2.0.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/util/virtpm.c | 2 ++
 src/util/virtpm.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index b898f3a6db..3c961c11cb 100644
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -47,6 +47,8 @@ VIR_ENUM_IMPL(virTPMSwtpmSetupFeature,
               "cmdarg-create-config-files",
               "tpm12-not-need-root",
               "cmdarg-reconfigure-pcr-banks",
+              "tpm-1.2",
+              "tpm-2.0",
 );
 
 /**
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index 0a82a03b69..bbf379a54a 100644
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -42,6 +42,8 @@ typedef enum {
     VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES,
     VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT,
     VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_RECONFIGURE_PCR_BANKS,
+    VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2,
+    VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0,
 
     VIR_TPM_SWTPM_SETUP_FEATURE_LAST
 } virTPMSwtpmSetupFeature;
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 14:25:49 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 16:25:49 +0200
Subject: [PATCH 4/4] qemu: Report supported TPM version in domcaps
In-Reply-To: <cover.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
Message-ID: <af6be2d38fd15cc75ffe652f0e759955ece51179.1657635928.git.mprivozn@redhat.com>

Now that we have everything prepared, we can start detecting
supported TPM versions and setting corresponding values in
backendModel struct.

Resolves: https://gitlab.com/libvirt/libvirt/-/issues/340
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103119
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_capabilities.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2c3be3ecec..8586930266 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6368,9 +6368,18 @@ virQEMUCapsFillDomainDeviceTPMCaps(virQEMUCaps *qemuCaps,
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH))
         VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_PASSTHROUGH);
-    if (virTPMHasSwtpm() &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR))
-        VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_EMULATOR);
+    if (virTPMHasSwtpm()) {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_EMULATOR))
+            VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendModel, VIR_DOMAIN_TPM_TYPE_EMULATOR);
+        if (virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2)) {
+            VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendVersion, VIR_DOMAIN_TPM_VERSION_1_2);
+            tpm->backendVersion.report = true;
+        }
+        if (virTPMSwtpmSetupCapsGet(VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0)) {
+            VIR_DOMAIN_CAPS_ENUM_SET(tpm->backendVersion, VIR_DOMAIN_TPM_VERSION_2_0);
+            tpm->backendVersion.report = true;
+        }
+    }
 
     /*
      * Need at least one frontend if it is to be usable by applications
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 14:25:46 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 16:25:46 +0200
Subject: [PATCH 1/4] docs: Document TPM portion of domcaps
In-Reply-To: <cover.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
Message-ID: <1ce16a9b3b4719ab91d951a14c5fb33a2835087b.1657635928.git.mprivozn@redhat.com>

Surprisingly, we don't document TPM part of domain capabilities.
Fortunately, the information exposed is pretty much self
explanatory, but we should document it regardless.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomaincaps.rst | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
index 933469b2a2..384b5eb7ea 100644
--- a/docs/formatdomaincaps.rst
+++ b/docs/formatdomaincaps.rst
@@ -494,6 +494,36 @@ instance:
 ``driverType``
    Options for the ``type`` attribute of the <filesystem><driver> element.
 
+TPM device
+^^^^^^^^^^
+
+TPM device capabilities are exposed under the ``tpm`` element. For instance:
+
+::
+
+  <domainCapabilities>
+    ...
+    <devices>
+      <tpm supported='yes'>
+        <enum name='model'>
+          <value>tpm-tis</value>
+          <value>tpm-crb</value>
+        </enum>
+        <enum name='backendModel'>
+          <value>passthrough</value>
+          <value>emulator</value>
+        </enum>
+      </tpm>
+      ...
+    </devices>
+  <domainCapabilities>
+
+``model``
+   Options for the ``model`` attribute of the <tpm/> element.
+``backendModel``
+   Options for the ``type`` attribute of the <tpm><backend/> element.
+
+
 Features
 ~~~~~~~~
 
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 12 14:25:48 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 12 Jul 2022 16:25:48 +0200
Subject: [PATCH 3/4] domcaps: Introduce TPM backendVersion
In-Reply-To: <cover.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
Message-ID: <eee1f33bdee6c40364d8c9e7ddbcddf8b1c107a7.1657635928.git.mprivozn@redhat.com>

We accept TPM version in the domain XML. However, supported
version depends on the host configuration (swtpm_setup binary)
and thus it may be tricky for users (or mgmt applications) chose
a version. Introduce machinery for reporting supported version in
domain capabilities.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomaincaps.rst      | 6 ++++++
 src/conf/domain_capabilities.c | 1 +
 src/conf/domain_capabilities.h | 1 +
 3 files changed, 8 insertions(+)

diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
index 384b5eb7ea..a60e610c4c 100644
--- a/docs/formatdomaincaps.rst
+++ b/docs/formatdomaincaps.rst
@@ -513,6 +513,10 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance:
           <value>passthrough</value>
           <value>emulator</value>
         </enum>
+        <enum name='backendVersion'>
+          <value>1.2</value>
+          <value>2.0</value>
+        </enum>
       </tpm>
       ...
     </devices>
@@ -522,6 +526,8 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance:
    Options for the ``model`` attribute of the <tpm/> element.
 ``backendModel``
    Options for the ``type`` attribute of the <tpm><backend/> element.
+``backendVersion``
+   Options for the ``version`` attribute of the <tpm><backend/> element.
 
 
 Features
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 895e8d00e8..33570a51db 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -539,6 +539,7 @@ virDomainCapsDeviceTPMFormat(virBuffer *buf,
 
     ENUM_PROCESS(tpm, model, virDomainTPMModelTypeToString);
     ENUM_PROCESS(tpm, backendModel, virDomainTPMBackendTypeToString);
+    ENUM_PROCESS(tpm, backendVersion, virDomainTPMVersionTypeToString);
 
     FORMAT_EPILOGUE(tpm);
 }
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index f2eed80b15..a526969cda 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -127,6 +127,7 @@ struct _virDomainCapsDeviceTPM {
     virTristateBool supported;
     virDomainCapsEnum model;   /* virDomainTPMModel */
     virDomainCapsEnum backendModel;   /* virDomainTPMBackendType */
+    virDomainCapsEnum backendVersion; /* virDomainTPMVersion */
 };
 
 STATIC_ASSERT_ENUM(VIR_DOMAIN_FS_DRIVER_TYPE_LAST);
-- 
2.35.1


From berrange at redhat.com  Tue Jul 12 15:31:43 2022
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Tue, 12 Jul 2022 16:31:43 +0100
Subject: [libvirt PATCH] docs: add info about factors affecting CPU
 compatibility
Message-ID: <20220712153143.1582774-1-berrange@redhat.com>

While libvirt solves most of the problem of ensuring compatibility, when
there is incompatibility it can be hard for users to track down the
cause. Everything knows to check the physical CPU model, but there are a
surprisingly large number of other factors influencing compatibility.

Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/drvqemu.rst | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst
index c174bdb4cf..3344df4fb6 100644
--- a/docs/drvqemu.rst
+++ b/docs/drvqemu.rst
@@ -416,6 +416,86 @@ following command should be run as root, prior to starting libvirtd
 libvirt will then place each virtual machine in a cgroup at
 ``/dev/cgroup/libvirt/qemu/$VMNAME/``
 
+
+Live migration compatibility
+----------------------------
+
+Many factors can affect the ability to live migrate a guest between a pair
+of hosts. It is critical that when QEMU is started on the destination host,
+the exposed guest machine ABI matches what was exposed by the existing QEMU
+process on the source host. To facilitate this, when libvirt receives a
+guest configuration document, it will attempt to expand any features that
+were not specified, to ensure a stable guest machine ABI. Mostly this involves
+adding address information to all devices, and adding controllers to attach
+the devices to.
+
+Certain features that affect the guest ABI, however, may only be known at the
+time the guest is started and can be influenced by features of the host OS
+and its hardware. This means that even if the guest XML configuration is the
+same, it may still be impossible to migrate the guest between two hosts.
+
+Migration CPU model compatibility
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The most common problems with migration compatibility surround the use of
+the guest CPU ``host-model`` or ``host-passthrough`` modes. Both of these
+modes attempt to expose the full host CPU featureset to the guest. The
+``host-model`` mode attempts to expose as many features as possible while
+retaining the ability to accurately check compatibility between hosts prior
+to migration running. The ``host-passthrough`` mode attempts to expose the
+host CPU as precisely as possible, but with the cost that it is not possible
+for libvirt to check compatibility prior to migration.
+
+If using ``host-model`` the target host hardware and software deployment
+must expose a superset of the features of the source host CPU. If using
+``host-passthrough`` the target host CPU and software deployment must
+always expose a superset of the fetures, however, it is further strongly
+recommended that the source and destination hosts be identical in every
+way.
+
+In both cases, there are a number of factors that will influence the CPU
+features available to the guest
+
+* **Physical CPU model** - the core constraint on what features are available.
+  Check ``/proc/cpuinfo`` for CPU model name.
+* **Firmware revision (BIOS/UEFI/etc)** - firmware updates may bundle microcode
+  updates which arbitrarily add or remove CPU features, typically in response
+  to new hardware vulnerabilities. Check ``dmidecode`` for details on ``x86``
+  and ``aarch64`` platforms for firmware version, and ``/proc/cpuinfo`` for
+  associated microcode version (if not updated by the OS).
+* **Firmware settings** - certain firmware settings can affect accessibility of
+  features. For example, turning on/off SMT/HT not only affects the number
+  of logical CPUs available to the OS, but can indirectly influence other
+  factors such as the number of performance counters available for use. Check
+  the firmware specific configuration interface.
+* **Host kernel version** - the host kernel software version may have a
+  need to block certain physical CPU features from use in the guest. It can
+  also emulate certain features that may not exist in the silicon, for example,
+  x2apic. Check ``uname -r`` output for kernel version.
+* **Host kernel settings** - the kernel command line options can be used to
+  block certain physical CPU features from use in the guest, for example,
+  ``tsx=off``, ``l1tf=...`` or ``nosmt``. Check ``/proc/cmdline`` and
+  ``/etc/modprobe.d/*.conf``.
+* **microcode update version** - while the firmware will load the initial
+  microcode in to the CPU, the OS may ship packages providing newer microcode
+  updates since these can be deployed on a more timely manner than firmware
+  updates. These updates can arbitrarily load add or remove CPU features.
+  Check ``/proc/cpuinfo`` for microcode version.
+* **QEMU version** - even when the kernel supports exposing a CPU feature to
+  the guest, an update in the QEMU emulator version will be required to unlock
+  its usage with a guest, except with ``host-passthrough``. Check the output
+  of ``$QEMU -version``.
+* **libvirt version** - even when the kernel and QEMU support exposing a CPU
+  feature to the guest, an update in the libvirt version will be required to
+  unlock its usage with a guest, except with ``host-passthrough``. Check
+  ``virsh version``.
+
+The ``virsh capabilities`` output will provide information on the high level
+CPU model, its features, microcode version. Most of the time this will provide
+enough information to know whether the CPUs of two hosts will be compatible.
+If there are unexpected differences though, checking the above list of
+influencing factors can reveal where the difference arises from.
+
 Import and export of libvirt domain XML configs
 -----------------------------------------------
 
-- 
2.36.1


From berrange at redhat.com  Tue Jul 12 16:27:33 2022
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Tue, 12 Jul 2022 17:27:33 +0100
Subject: [libvirt PATCH v2] docs: add info about factors affecting CPU
 compatibility
Message-ID: <20220712162733.1586844-1-berrange@redhat.com>

While libvirt solves most of the problem of ensuring compatibility, when
there is incompatibility it can be hard for users to track down the
cause. Everything knows to check the physical CPU model, but there are a
surprisingly large number of other factors influencing compatibility.

Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
---

In v2:

 - Also mention nested virt

 docs/drvqemu.rst | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst
index c174bdb4cf..c9f2432268 100644
--- a/docs/drvqemu.rst
+++ b/docs/drvqemu.rst
@@ -416,6 +416,89 @@ following command should be run as root, prior to starting libvirtd
 libvirt will then place each virtual machine in a cgroup at
 ``/dev/cgroup/libvirt/qemu/$VMNAME/``
 
+
+Live migration compatibility
+----------------------------
+
+Many factors can affect the ability to live migrate a guest between a pair
+of hosts. It is critical that when QEMU is started on the destination host,
+the exposed guest machine ABI matches what was exposed by the existing QEMU
+process on the source host. To facilitate this, when libvirt receives a
+guest configuration document, it will attempt to expand any features that
+were not specified, to ensure a stable guest machine ABI. Mostly this involves
+adding address information to all devices, and adding controllers to attach
+the devices to.
+
+Certain features that affect the guest ABI, however, may only be known at the
+time the guest is started and can be influenced by features of the host OS
+and its hardware. This means that even if the guest XML configuration is the
+same, it may still be impossible to migrate the guest between two hosts.
+
+Migration CPU model compatibility
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The most common problems with migration compatibility surround the use of
+the guest CPU ``host-model`` or ``host-passthrough`` modes. Both of these
+modes attempt to expose the full host CPU featureset to the guest. The
+``host-model`` mode attempts to expose as many features as possible while
+retaining the ability to accurately check compatibility between hosts prior
+to migration running. The ``host-passthrough`` mode attempts to expose the
+host CPU as precisely as possible, but with the cost that it is not possible
+for libvirt to check compatibility prior to migration.
+
+If using ``host-model`` the target host hardware and software deployment
+must expose a superset of the features of the source host CPU. If using
+``host-passthrough`` the target host CPU and software deployment must
+always expose a superset of the fetures, however, it is further strongly
+recommended that the source and destination hosts be identical in every
+way.
+
+In both cases, there are a number of factors that will influence the CPU
+features available to the guest
+
+* **Physical CPU model** - the core constraint on what features are available.
+  Check ``/proc/cpuinfo`` for CPU model name.
+* **Firmware revision (BIOS/UEFI/etc)** - firmware updates may bundle microcode
+  updates which arbitrarily add or remove CPU features, typically in response
+  to new hardware vulnerabilities. Check ``dmidecode`` for details on ``x86``
+  and ``aarch64`` platforms for firmware version, and ``/proc/cpuinfo`` for
+  associated microcode version (if not updated by the OS).
+* **Firmware settings** - certain firmware settings can affect accessibility of
+  features. For example, turning on/off SMT/HT not only affects the number
+  of logical CPUs available to the OS, but can indirectly influence other
+  factors such as the number of performance counters available for use. Check
+  the firmware specific configuration interface.
+* **Host kernel version** - the host kernel software version may have a
+  need to block certain physical CPU features from use in the guest. It can
+  also emulate certain features that may not exist in the silicon, for example,
+  x2apic. Check ``uname -r`` output for kernel version.
+* **Host kernel settings** - the kernel command line options can be used to
+  block certain physical CPU features from use in the guest, for example,
+  ``tsx=off``, ``l1tf=...`` or ``nosmt``. Check ``/proc/cmdline`` and
+  ``/etc/modprobe.d/*.conf``.
+* **microcode update version** - while the firmware will load the initial
+  microcode in to the CPU, the OS may ship packages providing newer microcode
+  updates since these can be deployed on a more timely manner than firmware
+  updates. These updates can arbitrarily load add or remove CPU features.
+  Check ``/proc/cpuinfo`` for microcode version.
+* **QEMU version** - even when the kernel supports exposing a CPU feature to
+  the guest, an update in the QEMU emulator version will be required to unlock
+  its usage with a guest, except with ``host-passthrough``. Check the output
+  of ``$QEMU -version``.
+* **libvirt version** - even when the kernel and QEMU support exposing a CPU
+  feature to the guest, an update in the libvirt version will be required to
+  unlock its usage with a guest, except with ``host-passthrough``. Check
+  ``virsh version``.
+* **Nested virtualization** - due to the limitations of nested virtualization,
+  a L1 nested host may not be able to expose the same featureset as a bare
+  metal host, even if everything else is the same.
+
+The ``virsh capabilities`` output will provide information on the high level
+CPU model, its features, microcode version. Most of the time this will provide
+enough information to know whether the CPUs of two hosts will be compatible.
+If there are unexpected differences though, checking the above list of
+influencing factors can reveal where the difference arises from.
+
 Import and export of libvirt domain XML configs
 -----------------------------------------------
 
-- 
2.36.1


From mprivozn at redhat.com  Wed Jul 13 06:46:55 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 13 Jul 2022 08:46:55 +0200
Subject: [libvirt PATCH v2] docs: add info about factors affecting CPU
 compatibility
In-Reply-To: <20220712162733.1586844-1-berrange@redhat.com>
References: <20220712162733.1586844-1-berrange@redhat.com>
Message-ID: <80becfb8-d18d-253b-1375-18b17ae11245@redhat.com>

On 7/12/22 18:27, Daniel P. Berrang? wrote:
> While libvirt solves most of the problem of ensuring compatibility, when
> there is incompatibility it can be hard for users to track down the
> cause. Everything knows to check the physical CPU model, but there are a
> surprisingly large number of other factors influencing compatibility.
> 
> Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
> ---
> 
> In v2:
> 
>  - Also mention nested virt
> 
>  docs/drvqemu.rst | 83 ++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 83 insertions(+)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From pkrempa at redhat.com  Wed Jul 13 07:33:04 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 13 Jul 2022 09:33:04 +0200
Subject: [PATCH 1/4] docs: Document TPM portion of domcaps
In-Reply-To: <1ce16a9b3b4719ab91d951a14c5fb33a2835087b.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
 <1ce16a9b3b4719ab91d951a14c5fb33a2835087b.1657635928.git.mprivozn@redhat.com>
Message-ID: <Ys51MD2cITpBd4tJ@angien.pipo.sk>

On Tue, Jul 12, 2022 at 16:25:46 +0200, Michal Privoznik wrote:
> Surprisingly, we don't document TPM part of domain capabilities.
> Fortunately, the information exposed is pretty much self
> explanatory, but we should document it regardless.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  docs/formatdomaincaps.rst | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
> index 933469b2a2..384b5eb7ea 100644
> --- a/docs/formatdomaincaps.rst
> +++ b/docs/formatdomaincaps.rst
> @@ -494,6 +494,36 @@ instance:
>  ``driverType``
>     Options for the ``type`` attribute of the <filesystem><driver> element.
>  
> +TPM device
> +^^^^^^^^^^
> +
> +TPM device capabilities are exposed under the ``tpm`` element. For instance:
> +
> +::

One neat thing RST allows is that you can put a double colon on the end
of the "For instance::" and then can omit the explicit code block by
separate double colons.

We use both so this is just an FYI, no need to change it.

> +
> +  <domainCapabilities>
> +    ...
> +    <devices>
> +      <tpm supported='yes'>
> +        <enum name='model'>
> +          <value>tpm-tis</value>
> +          <value>tpm-crb</value>
> +        </enum>
> +        <enum name='backendModel'>
> +          <value>passthrough</value>
> +          <value>emulator</value>
> +        </enum>
> +      </tpm>
> +      ...
> +    </devices>
> +  <domainCapabilities>

Closing tag here ^

> +
> +``model``
> +   Options for the ``model`` attribute of the <tpm/> element.
> +``backendModel``
> +   Options for the ``type`` attribute of the <tpm><backend/> element.

Please mark the XML elements as literals too.

> +
> +
>  Features
>  ~~~~~~~~
>  
> -- 
> 2.35.1
> 

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Wed Jul 13 07:35:20 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 13 Jul 2022 09:35:20 +0200
Subject: [PATCH 2/4] virtpm: Introduce TPM-1.2 and TPM-2.0 capabilieis
In-Reply-To: <1f6c74c1996026fb6e7d5442b624d834102d44c4.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
 <1f6c74c1996026fb6e7d5442b624d834102d44c4.1657635928.git.mprivozn@redhat.com>
Message-ID: <Ys51uKtNVqbV0rPK@angien.pipo.sk>

On Tue, Jul 12, 2022 at 16:25:47 +0200, Michal Privoznik wrote:
> These new capabilities will be used only to track whether
> swtpm_setup is capable of TPM-1.2 and/or TPM-2.0.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/util/virtpm.c | 2 ++
>  src/util/virtpm.h | 2 ++
>  2 files changed, 4 insertions(+)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Wed Jul 13 07:45:27 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 13 Jul 2022 09:45:27 +0200
Subject: [PATCH 3/4] domcaps: Introduce TPM backendVersion
In-Reply-To: <eee1f33bdee6c40364d8c9e7ddbcddf8b1c107a7.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
 <eee1f33bdee6c40364d8c9e7ddbcddf8b1c107a7.1657635928.git.mprivozn@redhat.com>
Message-ID: <Ys54F5UiBH28rnZm@angien.pipo.sk>

On Tue, Jul 12, 2022 at 16:25:48 +0200, Michal Privoznik wrote:
> We accept TPM version in the domain XML. However, supported
> version depends on the host configuration (swtpm_setup binary)

s/configuration//

AFAIK it depends on the build parameters of swtpm which isn't really
user-configurable.

> and thus it may be tricky for users (or mgmt applications) chose
> a version. Introduce machinery for reporting supported version in
> domain capabilities.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  docs/formatdomaincaps.rst      | 6 ++++++
>  src/conf/domain_capabilities.c | 1 +
>  src/conf/domain_capabilities.h | 1 +
>  3 files changed, 8 insertions(+)
> 
> diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
> index 384b5eb7ea..a60e610c4c 100644
> --- a/docs/formatdomaincaps.rst
> +++ b/docs/formatdomaincaps.rst
> @@ -513,6 +513,10 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance:
>            <value>passthrough</value>
>            <value>emulator</value>
>          </enum>
> +        <enum name='backendVersion'>
> +          <value>1.2</value>
> +          <value>2.0</value>
> +        </enum>
>        </tpm>
>        ...
>      </devices>
> @@ -522,6 +526,8 @@ TPM device capabilities are exposed under the ``tpm`` element. For instance:
>     Options for the ``model`` attribute of the <tpm/> element.
>  ``backendModel``
>     Options for the ``type`` attribute of the <tpm><backend/> element.
> +``backendVersion``
> +   Options for the ``version`` attribute of the <tpm><backend/> element.

XML elements as literals; same as in 1/1.

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Wed Jul 13 07:48:53 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 13 Jul 2022 09:48:53 +0200
Subject: [PATCH 4/4] qemu: Report supported TPM version in domcaps
In-Reply-To: <af6be2d38fd15cc75ffe652f0e759955ece51179.1657635928.git.mprivozn@redhat.com>
References: <cover.1657635928.git.mprivozn@redhat.com>
 <af6be2d38fd15cc75ffe652f0e759955ece51179.1657635928.git.mprivozn@redhat.com>
Message-ID: <Ys545SEp4jYsotJt@angien.pipo.sk>

On Tue, Jul 12, 2022 at 16:25:49 +0200, Michal Privoznik wrote:
> Now that we have everything prepared, we can start detecting
> supported TPM versions and setting corresponding values in
> backendModel struct.
> 
> Resolves: https://gitlab.com/libvirt/libvirt/-/issues/340
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103119
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_capabilities.c | 15 ++++++++++++---
>  1 file changed, 12 insertions(+), 3 deletions(-)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From jtomko at redhat.com  Wed Jul 13 08:47:26 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 10:47:26 +0200
Subject: [PATCH 3/5] qemu_capabilities: Track usb-host.guest-resets-all
 capability
In-Reply-To: <9b8a0b2d5a8acc3c1f946690419b49fb906408e7.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
 <9b8a0b2d5a8acc3c1f946690419b49fb906408e7.1657631390.git.mprivozn@redhat.com>
Message-ID: <Ys6GnmRmWQMl17io@fedora>

On a Tuesday in 2022, Michal Privoznik wrote:
>We will need two attributes of usb-host device to set:
>guest-reset and guest-resets-all. The former was introduced in
>QEMU v4.0.0-rc0~56^2 and the other in v4.2.0-rc1~9^2. Hence,
>track the latter only as it's only starting from that commit when
>QEMU has both attributes.
>
>Our qemucapabilitiesdata are wrong though, as they enable the
>capability for quite old releases (for instance 3.1.0 when
>neither of the attributes existed). But this is because I didn't
>use actual QEMU to refresh .replies files in v6.9.0-rc1~457. I
>just blindly copied particular reply around. But that's okay, it
>doesn't really hurt anything.
>

It hurts the usefulness of our test data. Just like in v6.9.0-rc1~457
you only added the relevant attribute only to QEMU versions that have
it, you should delete it from older replies here, to demonstrate
that the capability detection code actually works.

So there should be no "guest-reset" until QEMU 4.0.0,
no "guest-resets-all" until QEMU 4.2.0 and while you're at it,
"hostdevice" was added in QEMU 5.1.0 by 9f815e83e983d and
so was "suppress-remote-wake" by 7bacaf5fea

Jano

>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/qemu/qemu_capabilities.c                      | 2 ++
> src/qemu/qemu_capabilities.h                      | 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 +
> tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
> tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
> 33 files changed, 34 insertions(+)
>
>diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
>index 2c3be3ecec..2d352f406b 100644
>--- a/src/qemu/qemu_capabilities.c
>+++ b/src/qemu/qemu_capabilities.c
>@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>               "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
>               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
>               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
>+              "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
>     );
>
>
>@@ -1459,6 +1460,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPCIeRootPort[] =
>
> static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBHost[] = {
>     { "hostdevice", QEMU_CAPS_USB_HOST_HOSTDEVICE, NULL },
>+    { "guest-resets-all", QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, NULL },
> };
>
> static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHostBridge[] = {
>diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
>index 6f35ba1485..a409c1272c 100644
>--- a/src/qemu/qemu_capabilities.h
>+++ b/src/qemu/qemu_capabilities.h
>@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
>     QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
>     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
>     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
>+    QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
>
>     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 cc6e75884b..b4acdebb37 100644
>--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
>+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
>@@ -135,6 +135,7 @@
>   <flag name='cpu-max'/>
>   <flag name='input-linux'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>3001000</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 27be36f0ab..d62e543459 100644
>--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
>@@ -179,6 +179,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>3001000</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 7e0b8fbddf..cde5b4f54c 100644
>--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
>@@ -147,6 +147,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 19bbbd1de3..c8726cbb22 100644
>--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
>@@ -152,6 +152,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 ef6f04f54b..81dcfaa5cb 100644
>--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
>@@ -144,6 +144,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 7c65aff290..ee855a1077 100644
>--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
>@@ -144,6 +144,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 9b5ed96ba3..a0c186c41f 100644
>--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
>@@ -114,6 +114,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 3cf6a66389..d0fbb90c89 100644
>--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
>@@ -187,6 +187,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 5daa7bda75..363bcf0739 100644
>--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
>@@ -194,6 +194,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 162ace7b2b..875e491581 100644
>--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
>@@ -162,6 +162,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>4002000</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 7c5275210b..428ecd4f42 100644
>--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
>@@ -159,6 +159,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>4002000</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 ce5b782afd..725745593c 100644
>--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
>@@ -127,6 +127,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>4002000</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 9ee4c0534d..6a54c44d79 100644
>--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
>@@ -205,6 +205,7 @@
>   <flag name='input-linux'/>
>   <flag name='query-display-options'/>
>   <flag name='virtio-blk.queue-size'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <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 29ee31473f..35998cabf0 100644
>--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
>@@ -174,6 +174,7 @@
>   <flag name='virtio-blk.queue-size'/>
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>61700241</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
>index 1fdec901a6..b8ddf2e9a8 100644
>--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
>@@ -180,6 +180,7 @@
>   <flag name='virtio-blk.queue-size'/>
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>42900241</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
>index 3b58e7fece..c49c258255 100644
>--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
>@@ -166,6 +166,7 @@
>   <flag name='virtio-blk.queue-size'/>
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>0</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
>index bee5a84cf9..ce297f2ef5 100644
>--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
>@@ -214,6 +214,7 @@
>   <flag name='virtio-blk.queue-size'/>
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100241</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
>index 070f64cb1c..a49650cbcc 100644
>--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
>@@ -218,6 +218,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5001000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100242</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
>index 8e17532f3a..42a4418a08 100644
>--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
>@@ -181,6 +181,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5002000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>61700243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
>index df02e264d7..d0dd058743 100644
>--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
>@@ -185,6 +185,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5002000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>42900243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
>index 7cb4383693..25339f86d9 100644
>--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
>@@ -171,6 +171,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5002000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>0</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
>index cad4ed40e6..4ff03dbead 100644
>--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
>@@ -222,6 +222,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>5002000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
>index 4b4cc2d3aa..2d861da97b 100644
>--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
>@@ -189,6 +189,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>6000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>61700242</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
>index 8c61bf8a84..38acee5f18 100644
>--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
>@@ -231,6 +231,7 @@
>   <flag name='memory-backend-file.prealloc-threads'/>
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>6000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100242</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
>index afd8f606eb..b03c6bfc24 100644
>--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
>@@ -236,6 +236,7 @@
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>   <flag name='chardev.qemu-vdagent'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>6001000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
>index 86fc46918f..942c0ba169 100644
>--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
>@@ -201,6 +201,7 @@
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>   <flag name='chardev.qemu-vdagent'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>6001050</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>61700244</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
>index 19605d93ae..32f226acbd 100644
>--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
>@@ -238,6 +238,7 @@
>   <flag name='virtio-iommu-pci'/>
>   <flag name='virtio-net.rss'/>
>   <flag name='chardev.qemu-vdagent'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>6002000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100244</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
>index e24e2235fb..f4d7cbdd10 100644
>--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
>+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
>@@ -209,6 +209,7 @@
>   <flag name='virtio-iommu.boot-bypass'/>
>   <flag name='virtio-net.rss'/>
>   <flag name='chardev.qemu-vdagent'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>6002092</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>61700243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
>index 83e0f50e3a..2f895294de 100644
>--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
>+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
>@@ -213,6 +213,7 @@
>   <flag name='virtio-iommu.boot-bypass'/>
>   <flag name='virtio-net.rss'/>
>   <flag name='chardev.qemu-vdagent'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>7000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>42900243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
>index 05f844fd5b..17ea778d38 100644
>--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
>@@ -243,6 +243,7 @@
>   <flag name='virtio-net.rss'/>
>   <flag name='chardev.qemu-vdagent'/>
>   <flag name='display-dbus'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>7000000</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100243</microcodeVersion>
>diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
>index 3707d9b7c9..5f5c839fea 100644
>--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
>+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
>@@ -244,6 +244,7 @@
>   <flag name='chardev.qemu-vdagent'/>
>   <flag name='display-dbus'/>
>   <flag name='iothread.thread-pool-max'/>
>+  <flag name='usb-host.guest-resets-all'/>
>   <version>7000050</version>
>   <kvmVersion>0</kvmVersion>
>   <microcodeVersion>43100244</microcodeVersion>
>-- 
>2.35.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/3d730225/attachment-0001.sig>

From jtomko at redhat.com  Wed Jul 13 08:48:44 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 10:48:44 +0200
Subject: [PATCH 1/5] tests: Update hostdev-usb-* hostdev-pci-* xml2xml
 and xml2argv tests
In-Reply-To: <6e989f371cbb3f8a3644230d684e1d6e8864fc9b.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
 <6e989f371cbb3f8a3644230d684e1d6e8864fc9b.1657631390.git.mprivozn@redhat.com>
Message-ID: <Ys6G7BY8WPkTfzAM@fedora>

On a Tuesday in 2022, Michal Privoznik wrote:
>Currently, we have bunch of PCI/USB tests cases for
>qemuxml2argvtest and qemuxml2xmltest but all of them run without
>any capabilities. This makes is needlessly complicated when
>trying to extend them. Switch to DO_TEST_CAPS_LATEST().
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> .../hostdev-pci-address-device.args           | 34 -----------------
> ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++
> .../hostdev-pci-address-device.xml            |  2 +-
> .../qemuxml2argvdata/hostdev-pci-address.args | 33 ----------------
> .../hostdev-pci-address.x86_64-latest.args    | 37 ++++++++++++++++++
> .../qemuxml2argvdata/hostdev-pci-address.xml  |  2 +-
> .../hostdev-usb-address-device-boot.args      | 34 -----------------
> ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++
> .../hostdev-usb-address-device-boot.xml       |  2 +-
> .../hostdev-usb-address-device.args           | 34 -----------------
> ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++
> .../hostdev-usb-address-device.xml            |  2 +-
> .../qemuxml2argvdata/hostdev-usb-address.args | 33 ----------------
> .../hostdev-usb-address.x86_64-latest.args    | 37 ++++++++++++++++++
> .../qemuxml2argvdata/hostdev-usb-address.xml  |  2 +-
> tests/qemuxml2argvtest.c                      | 10 ++---
> ... => hostdev-pci-address.x86_64-latest.xml} |  7 +++-
> ... => hostdev-usb-address.x86_64-latest.xml} |  7 +++-
> tests/qemuxml2xmltest.c                       |  4 +-
> 19 files changed, 210 insertions(+), 184 deletions(-)
> delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args
> create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args
> create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
> create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args
> create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
> delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args
> create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
> rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%)
> rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (85%)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/52d87afd/attachment.sig>

From jtomko at redhat.com  Wed Jul 13 08:48:58 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 10:48:58 +0200
Subject: [PATCH 2/5] conf: Introduce @guestReset to hostdev's <source/>
In-Reply-To: <32dfa9ec0598eb84267672a34442b1592524baa6.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
 <32dfa9ec0598eb84267672a34442b1592524baa6.1657631390.git.mprivozn@redhat.com>
Message-ID: <Ys6G+glaEdZKGskU@fedora>

On a Tuesday in 2022, Michal Privoznik wrote:
>Some USB devices have a buggy firmware that either crashes on
>device reset, or make the device unusable in some other way.
>Fortunately, QEMU offers a way to skip device reset either
>completely, or if device is not initialized yet. Expose this
>ability to users under:
>
>    <hostdev mode='subsystem' type='usb'>
>      <source guestReset='off'/>
>    </hostdev>
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> docs/formatdomain.rst                          | 15 ++++++++++++++-
> src/conf/domain_conf.c                         | 18 ++++++++++++++++++
> src/conf/domain_conf.h                         | 13 +++++++++++++
> src/conf/schemas/domaincommon.rng              |  9 +++++++++
> tests/qemuxml2argvdata/hostdev-usb-address.xml |  2 +-
> .../hostdev-usb-address.x86_64-latest.xml      |  2 +-
> 6 files changed, 56 insertions(+), 3 deletions(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/3752e102/attachment.sig>

From jtomko at redhat.com  Wed Jul 13 08:49:15 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 10:49:15 +0200
Subject: [PATCH 4/5] qemu_validate: Validate that QEMU's capable of
 guestReset
In-Reply-To: <5058101f1f541d12a0775fc4030f8a878e9d3f22.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
 <5058101f1f541d12a0775fc4030f8a878e9d3f22.1657631390.git.mprivozn@redhat.com>
Message-ID: <Ys6HC4K9B4LQhVuL@fedora>

On a Tuesday in 2022, Michal Privoznik wrote:
>Now that we have a capability, validate that the QEMU we are
>talking to has everything we need for guestReset.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/qemu/qemu_validate.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/8877703e/attachment.sig>

From jtomko at redhat.com  Wed Jul 13 08:49:35 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 10:49:35 +0200
Subject: [PATCH 5/5] qemu: Generate cmd line for guestReset
In-Reply-To: <937bb17dcb53d36cb7036c1589b117ce7e4cf54f.1657631390.git.mprivozn@redhat.com>
References: <cover.1657631390.git.mprivozn@redhat.com>
 <937bb17dcb53d36cb7036c1589b117ce7e4cf54f.1657631390.git.mprivozn@redhat.com>
Message-ID: <Ys6HHxo4QCtQHvOe@fedora>

On a Tuesday in 2022, Michal Privoznik wrote:
>QEMU offers two attributes for handling reset requests of an USB
>host device: guest-reset and guest-resets-all. When combined they
>act as follows:
>
>1) guest-reset=false
>   The guest is not allowed to reset the physical USB device.
>
>2) guest-reset=true,guest-resets-all=false
>   The guest is allowed to reset the device when it is not yet
>   initialized (aka no USB bus address assigned). Usually this results
>   in one guest reset being allowed. This is the default behavior.
>
>3) guest-reset=true,guest-resets-all=true
>   The guest is allowed to reset the device as it pleases.
>
>Now, there's a clear 1:1 mapping with our representation of
>guestReset, so generating cmd line is trivial.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> src/qemu/qemu_command.c                       | 21 +++++++++++++++++++
> .../hostdev-usb-address.x86_64-latest.args    |  2 +-
> 2 files changed, 22 insertions(+), 1 deletion(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/3096bcd3/attachment.sig>

From jtomko at redhat.com  Wed Jul 13 08:53:48 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 10:53:48 +0200
Subject: [PATCH 0/5] Follow up fixes for IOThreads
In-Reply-To: <cover.1657266850.git.mprivozn@redhat.com>
References: <cover.1657266850.git.mprivozn@redhat.com>
Message-ID: <Ys6IHBWs4kQweQHl@fedora>

On a Friday in 2022, Michal Privoznik wrote:
>Couple of issues were found with my recent work on IOThread and its pool
>size limits. Here are fixes.
>
>Michal Pr?vozn?k (5):
>  domain_conf: Format <defaultiothread/> more often
>  domain_conf: Format iothread IDs more often
>  qemu: Make IOThread changing more robust
>  qemuDomainSetIOThreadParams: Accept VIR_DOMAIN_AFFECT_CONFIG flag
>  virsh: Implement --config for iothreadset
>
> src/conf/domain_conf.c |  50 ++++++++++----------
> src/qemu/qemu_driver.c | 101 +++++++++++++++++++++++------------------
> tools/virsh-domain.c   |   8 ++++
> 3 files changed, 90 insertions(+), 69 deletions(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/95b9540c/attachment.sig>

From berrange at redhat.com  Wed Jul 13 10:05:41 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:05:41 +0100
Subject: [libvirt PATCH 01/10] docs: Move the CI dashboard to its own RST
 module
In-Reply-To: <6954e11153b795244ab784bfed559f1fa2f87fb8.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <6954e11153b795244ab784bfed559f1fa2f87fb8.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6Y9e+0kUjnm28S@redhat.com>

On Tue, Jul 12, 2022 at 02:44:33PM +0200, Erik Skultety wrote:
> The dashboard itself simply takes away focus from everything else that
> makes sense to have in the CI article, so move it to it's own article
> and link it from the main CI article.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci-dashboard.rst | 216 ++++++++++++++++++++++++++++++++++++++++++
>  docs/ci.rst           | 192 +------------------------------------
>  docs/meson.build      |   1 +
>  3 files changed, 219 insertions(+), 190 deletions(-)
>  create mode 100644 docs/ci-dashboard.rst

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:09:00 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:09:00 +0100
Subject: [libvirt PATCH 02/10] docs: Provide more information about the
 TCK test suite
In-Reply-To: <51aed5f5bd8227f2901acefc617f3706ef032b0c.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <51aed5f5bd8227f2901acefc617f3706ef032b0c.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6ZvFzkKCRcO6Zh@redhat.com>

On Tue, Jul 12, 2022 at 02:44:34PM +0200, Erik Skultety wrote:
> Most importantly, how to get it, how install dependencies and how
> to run it.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/testtck.rst | 92 ++++++++++++++++++++++++++++++++++++++++++------
>  1 file changed, 81 insertions(+), 11 deletions(-)

> +Running TCK
> +~~~~~~~~~~~
> +
> +Once you have all the dependencies installed, you can then proceed with running
> +as root the test suite as root (when running with Avocado):
> +
> +::
> +
> +    # avocado --config avocado.config run --tap - ./scripts/
> +
> +from the TCK's git root.
> +
> +
> +If you don't want to install Avocado you can execute tests using the
> +``libvirt-tck`` binary directly (again, from the git root). You'll need to pass
> +a few options that Avocado takes care of:
> +
> +::
> +
> +    # PERL5LIB=./lib perl bin/libvirt-tck -c <path_to_config> --force ./scripts

We don't need --force here technically - that's only if you want it
to cleanup a previously aborted test run that didn't do cleanup itself.

> +Note that running with root privileges is necessary since some tests need
> +access to system resources or configs. This, along with the fact that some
> +tests might affect the host system are good reasons to consider using a test VM
> +as described above.

One day we ought to make it work again as non-root, as it used to be
ok in the past. It would be useful to have coverage of qemu:///session
as we've had a few times where we caused regressions in unprivileged
libvirtd usage, since most of our developers test privileged. Unpriv
is getting more important given KubeVirt's desire to get fully
unprivileged.

With '--force' removed, or a note about it added

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:10:33 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:10:33 +0100
Subject: [libvirt PATCH 03/10] docs: Provide an article on how to add a
 custom runner to the project
In-Reply-To: <0bccf4deff93ffb630da626060b74d116e71b665.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <0bccf4deff93ffb630da626060b74d116e71b665.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6aGRqIbX9RYSAb@redhat.com>

On Tue, Jul 12, 2022 at 02:44:35PM +0200, Erik Skultety wrote:
> Since running our functional test suite in GitLab cannot make use of
> the shared resources it makes sense to document the process of adding
> own HW to run the custom libvirt executor that powers the integration
> suite. This article will likely make even more sense in the future with
> GitLab severely cutting down on shared CI resources.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci-runners.rst | 86 +++++++++++++++++++++++++++++++++++++++++++++
>  docs/meson.build    |  1 +
>  2 files changed, 87 insertions(+)
>  create mode 100644 docs/ci-runners.rst

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:14:52 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:14:52 +0100
Subject: [libvirt PATCH 04/10] docs: Provide an article on testing
In-Reply-To: <57592e2914da8c618b11d0c6888e2c07664edcb7.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <57592e2914da8c618b11d0c6888e2c07664edcb7.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6bHMTzQLLqZVYP@redhat.com>

On Tue, Jul 12, 2022 at 02:44:36PM +0200, Erik Skultety wrote:
> Currently we don't have much information on how testing is done in
> libvirt and the little we have is scattered among multiple files. This
> patch creates a common landing page containing all important bits about
> testing in libvirt, providing links to respective sections which
> deserve their own articles.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/meson.build |   1 +
>  docs/testing.rst | 176 +++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 177 insertions(+)
>  create mode 100644 docs/testing.rst
> 
> diff --git a/docs/meson.build b/docs/meson.build
> index 0c7c54a75f..6d61e18385 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -105,6 +105,7 @@ docs_rst_files = [
>    'submitting-patches',
>    'support',
>    'testapi',
> +  'testing',
>    'testsuites',
>    'testtck',
>    'uri',
> diff --git a/docs/testing.rst b/docs/testing.rst
> new file mode 100644
> index 0000000000..af0f334633
> --- /dev/null
> +++ b/docs/testing.rst
> @@ -0,0 +1,176 @@
> +=======
> +Testing
> +=======
> +
> +.. contents::
> +
> +Different types of tests are available to libvirt developers for testing a
> +given libvirt release.
> +
> +Unit tests
> +----------
> +
> +The unit test suite present in the source code is mainly used to test our
> +XML parser/formatter, QEMU command line generator, QEMU capabilities probing,
> +etc. It is run by developers before submitting patches upstream and is
> +mandatory to pass for any contribution to be accepted upstream. One can run
> +the test suite in the source tree with the following
> +
> +::
> +
> +    make check (libvirt 6.6.0 and older)
> +

IMHO we can ignore documenting such old releases. 

> +::
> +
> +    ninja test (libvirt 6.7.0 and newer)
> +
> +



> +Docker Prerequisites
> +~~~~~~~~~~~~~~~~~~~~
> +
> +Install "docker" with the system package manager and start the Docker service
> +on your development machine, then make sure you have the privilege to run
> +Docker commands. Typically it means setting up passwordless ``sudo docker``
> +command or login as root. For example:
> +
> +.. code::
> +
> +  $ sudo yum install docker

s/yum/dnf/   and perhaps also   'install -y'

> +  $ # or `apt-get install docker` for Ubuntu, etc.
> +  $ sudo systemctl start docker
> +  $ sudo docker ps
> +
> +The last command should print an empty table, to verify the system is ready.
> +
> +An alternative method to set up permissions is by adding the current user to
> +"docker" group and making the docker daemon socket file (by default
> +``/var/run/docker.sock``) accessible to the group:
> +
> +.. code::
> +
> +  $ sudo groupadd docker
> +  $ sudo usermod $USER -a -G docker
> +  $ sudo chown :docker /var/run/docker.sock
> +
> +Note that any one of above configurations makes it possible for the user to
> +exploit the whole host with Docker bind mounting or other privileged
> +operations.  So only do it on development machines.
> +
> +Podman Prerequisites
> +~~~~~~~~~~~~~~~~~~~~
> +
> +Install "podman" with the system package manager.
> +
> +.. code::
> +
> +  $ sudo dnf install podman

  Also 'install -y'

> +  $ podman ps
> +
> +The last command should print an empty table, to verify the system is ready.

Given it has much simpler setup, and doesn't open a local root shell
I'd suggest we document podman first, and explicitly recommend its
usage, over docker.




With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:15:08 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:15:08 +0100
Subject: [libvirt PATCH 05/10] docs: Replace testsuites article with the
 new 'testing' article
In-Reply-To: <bc890d3afa1fa0a1cc3a81fab7ce95b76f461cb3.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <bc890d3afa1fa0a1cc3a81fab7ce95b76f461cb3.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6bLCx+dJGE6j1y@redhat.com>

On Tue, Jul 12, 2022 at 02:44:37PM +0200, Erik Skultety wrote:
> The new article provides more in-depth information on testing options
> in libvirt.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/docs.rst | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:19:52 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:19:52 +0100
Subject: [libvirt PATCH 06/10] docs: Drop the testsuites article
In-Reply-To: <55365b783f38e3bcdaeb3001a61f22631a3febbe.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <55365b783f38e3bcdaeb3001a61f22631a3febbe.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6cSCNUi/nkemk9@redhat.com>

On Tue, Jul 12, 2022 at 02:44:38PM +0200, Erik Skultety wrote:
> The article was replaced with a new one in previous commit, so we don't
> need this one anymore.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/meson.build    |  1 -
>  docs/testsuites.rst | 37 -------------------------------------
>  2 files changed, 38 deletions(-)
>  delete mode 100644 docs/testsuites.rst

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:21:08 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:21:08 +0100
Subject: [libvirt PATCH 07/10] docs: Change the CI headline from "CI
 Testing" to "CI"
In-Reply-To: <89f21ed24a7931b958a97312f2678c1905205324.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <89f21ed24a7931b958a97312f2678c1905205324.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6clDYaJGe2uX24@redhat.com>

On Tue, Jul 12, 2022 at 02:44:39PM +0200, Erik Skultety wrote:
> It's not just strategy the master CI article talks (or will talk in the
> future) about.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/docs.rst | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:22:28 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:22:28 +0100
Subject: [libvirt PATCH 08/10] docs: ci: Add info about the two major
 types of jobs our CI runs
In-Reply-To: <fa151581bc5091dcec4486c6d81b4b914685cf9f.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <fa151581bc5091dcec4486c6d81b4b914685cf9f.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6c5Hth5i3QZF3+@redhat.com>

On Tue, Jul 12, 2022 at 02:44:40PM +0200, Erik Skultety wrote:
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci.rst | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/docs/ci.rst b/docs/ci.rst
> index d5282c4d25..bef023c521 100644
> --- a/docs/ci.rst
> +++ b/docs/ci.rst
> @@ -8,6 +8,9 @@ The libvirt project uses GitLab CI for automated testing.
>  `Here's <ci-dashboard.html>`__ our CI dashboard which shows the current status
>  of our pipelines.
>  
> +Libvirt builds
> +==============

THis section talks about FreeBSD/macOS via Cirrus CI too.

Perhaps call it

  'Build and unit tests'

> +
>  Linux builds and cross-compiled Windows builds happen on GitLab CI's shared
>  runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
>  <https://cirrus-ci.com/>`_ jobs behind the scenes.
> @@ -15,11 +18,28 @@ runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
>  Most of the tooling used to build CI pipelines is maintained as part of the
>  `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci>`_ subproject.
>  
> +Integration tests
> +=================
>  
> +Integration tests in our CI pipelines require dedicated HW which is not
> +available to forks, see `GitLab CI Custom Runners <ci-runners.html>`__.
> +Therefore, in order to execute the integration tests as part of your libvirt
> +fork's GitLab CI you'll need to provide your own runner. You'll also need to
> +set a few CI variables to run the integration tests as part of the CI pipeline,
> +see below.
>  
> +GitLab CI variables
> +-------------------
>  
> +* ``LIBVIRT_CI_INTEGRATION`` - enables integration test runs manually or in forks
> +* ``LIBVIRT_CI_INTEGRATION_RUNNER_TAG`` - overrides the upstream runner tag on the
>  
> +Retrieving test logs
> +--------------------
>  
> +In case the integration test suite fails in our CI pipelines, a job artifact is
> +generated containing Avocado logs, libvirt debug logs, and the latest traceback
> +(if one was produced during a daemon's execution).
>  
>  
>  
> -- 
> 2.36.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 10:28:02 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:28:02 +0100
Subject: [libvirt PATCH 09/10] docs: ci: Add a section on how to add a
 new platform to libvirt CI
In-Reply-To: <44e6584d63af4e9f1c6a25c3fa9a4200f6dabea7.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <44e6584d63af4e9f1c6a25c3fa9a4200f6dabea7.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6eMlikZgFJcbZi@redhat.com>

On Tue, Jul 12, 2022 at 02:44:41PM +0200, Erik Skultety wrote:
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci.rst | 39 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
> 
> diff --git a/docs/ci.rst b/docs/ci.rst
> index bef023c521..ea1b839eac 100644
> --- a/docs/ci.rst
> +++ b/docs/ci.rst
> @@ -41,21 +41,60 @@ In case the integration test suite fails in our CI pipelines, a job artifact is
>  generated containing Avocado logs, libvirt debug logs, and the latest traceback
>  (if one was produced during a daemon's execution).
>  
> +Adding new OS platforms OR build pre-requisites
> +===============================================
>  
> +Since all of the Dockerfiles libvirt uses for CI have been generated by ``lcitool``
> +provided by the `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci.git>`__ project,
> +most relevant changes will need to be introduced to ``lcitool`` first.
>  
> +In cases where ``libvirt-ci`` does not know about the OS distro/build
> +pre-requisite that is desired to be tested, proceed with the following:
>  
> + * Send a mail regarding your desired build/coverage change to libvir-list
>  
> +   Note that in case you're looking into adding a new OS platform there are
> +   limited CI compute resources available to libvirt, so the cost/benefit
> +   trade-off of adding new OS distros needs to be considered and
> +   is subject to a discussion on the mailing list.
>  
> + * File an issue at https://gitlab.com/libvirt/libvirt-ci/-/issues
> +   pointing to the libvir-list mail thread in the archives.
>  
> +   This alerts other people who might be interested in the work
> +   to avoid duplication, as well as to get feedback from libvirt-ci
> +   maintainers on any tips to ease the addition.

I feel it'd be sufficient to just have the libvirt-ci issue, as all the
maintainers interested in CI pay attention to that, but no big deal
either way.

> +Assuming there is agreement to the change you wish to make then
>  
> + #. Fork the ``libvirt-ci`` project on gitlab
>  
> + #.
> +    * If adding a new OS distro, add metadata under
> +      ``guests/lcitool/lcitool/ansible/group_vars/``
> +      for the new OS distro. There might be code changes required if
> +      the OS distro uses a package format not currently known. The
> +      ``libvirt-ci`` maintainers can advise on this when the issue
> +      is file. Edit the ``mappings.yml`` file to update all the existing package
> +      entries, providing details of the new OS distro **OR**
>  
> +    * If **NOT** adding a new OS distro, simply edit the ``mappings.yml`` file
> +      to provide a distro-agnostic mapping for the pre-requisite you're adding
>  
> + #. Commit the ``mappings.yml`` change and submit a merge request to
> +    the ``libvirt-ci`` project
>  
> + #. CI pipeline will run to validate that the changes to ``mappings.yml``
> +    are correct, by attempting to install the newly listed package on
> +    all OS distributions supported by ``libvirt-ci``
>  
> + #. Once the merge request is accepted, go back to libvirt and update the
> +    ``ci/manifest.yml`` file to reflect your change

I feel like these bits probably ought to be put in a doc like;

  $libvirt-ci.git/docs/new-distro.rst

and just link to the git msater of that doc from here. GitLab renders the
RST nicely enough, and it'd be nice to have these steps in a self-contained
doc, so I can point QEMU maintainers to it too.

>  
> + #. From the root of the libvirt git repository run
>  
> +::
>  
> +    $ lcitool manifest

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mprivozn at redhat.com  Wed Jul 13 10:30:53 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 13 Jul 2022 12:30:53 +0200
Subject: [PATCH 3/5] qemu_capabilities: Track usb-host.guest-resets-all
 capability
In-Reply-To: <Ys6GnmRmWQMl17io@fedora>
References: <cover.1657631390.git.mprivozn@redhat.com>
 <9b8a0b2d5a8acc3c1f946690419b49fb906408e7.1657631390.git.mprivozn@redhat.com>
 <Ys6GnmRmWQMl17io@fedora>
Message-ID: <6530e83a-3b72-78f7-cb79-082613410c44@redhat.com>

On 7/13/22 10:47, J?n Tomko wrote:
> On a Tuesday in 2022, Michal Privoznik wrote:
>> We will need two attributes of usb-host device to set:
>> guest-reset and guest-resets-all. The former was introduced in
>> QEMU v4.0.0-rc0~56^2 and the other in v4.2.0-rc1~9^2. Hence,
>> track the latter only as it's only starting from that commit when
>> QEMU has both attributes.
>>
>> Our qemucapabilitiesdata are wrong though, as they enable the
>> capability for quite old releases (for instance 3.1.0 when
>> neither of the attributes existed). But this is because I didn't
>> use actual QEMU to refresh .replies files in v6.9.0-rc1~457. I
>> just blindly copied particular reply around. But that's okay, it
>> doesn't really hurt anything.
>>
> 
> It hurts the usefulness of our test data. Just like in v6.9.0-rc1~457
> you only added the relevant attribute only to QEMU versions that have
> it, you should delete it from older replies here, to demonstrate
> that the capability detection code actually works.

I'm not sure how capability detection could not have worked since I had
to add <flag name='usb-host.guest-resets-all'/> to capabiliteis XMLs.
Unless it would be set unconditionally, which it is not.

> 
> So there should be no "guest-reset" until QEMU 4.0.0,
> no "guest-resets-all" until QEMU 4.2.0 and while you're at it,
> "hostdevice" was added in QEMU 5.1.0 by 9f815e83e983d and
> so was "suppress-remote-wake" by 7bacaf5fea

I guess I just wanted to save myself from useless work since we are
going to drop those files soon. But okay, let me post a patch to clean
up those files.

Michal


From berrange at redhat.com  Wed Jul 13 10:31:09 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 11:31:09 +0100
Subject: [libvirt PATCH 10/10] docs: ci: Add a brief section on how to
 run the CI workload locally
In-Reply-To: <ba43f9e5431ad12aecaa1ecaae2493402626c177.1657629865.git.eskultet@redhat.com>
References: <cover.1657629865.git.eskultet@redhat.com>
 <ba43f9e5431ad12aecaa1ecaae2493402626c177.1657629865.git.eskultet@redhat.com>
Message-ID: <Ys6e7d98LBtgQHx0@redhat.com>

On Tue, Jul 12, 2022 at 02:44:42PM +0200, Erik Skultety wrote:
> This is just a glue to the testing article introduced in previous
> commits.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci.rst | 4 ++++
>  1 file changed, 4 insertions(+)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 11:07:47 2022
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Wed, 13 Jul 2022 12:07:47 +0100
Subject: [libvirt PATCH] docs: replace ARRAY_CARDINALITY with G_N_ELEMENTS
Message-ID: <20220713110747.1611884-1-berrange@redhat.com>

Fix docs illustrating call with an obsolete macro.

Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/kbase/internals/locking.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/kbase/internals/locking.rst b/docs/kbase/internals/locking.rst
index 50d2b92d57..7a863ab4b2 100644
--- a/docs/kbase/internals/locking.rst
+++ b/docs/kbase/internals/locking.rst
@@ -127,7 +127,7 @@ locks, this will be done from the libvirtd process.
    };
    mgr = virLockManagerNew(lockPlugin,
                            VIR_LOCK_MANAGER_TYPE_DOMAIN,
-                           ARRAY_CARDINALITY(params),
+                           G_N_ELEMENTS(params),
                            params,
                            0)));
 
@@ -171,7 +171,7 @@ however, a process may voluntarily give up the lock by running
    };
    mgr = virLockManagerNew(lockPlugin,
                            VIR_LOCK_MANAGER_TYPE_DOMAIN,
-                           ARRAY_CARDINALITY(params),
+                           G_N_ELEMENTS(params),
                            params,
                            0)));
 
-- 
2.36.1


From phrdina at redhat.com  Wed Jul 13 11:11:51 2022
From: phrdina at redhat.com (Pavel Hrdina)
Date: Wed, 13 Jul 2022 13:11:51 +0200
Subject: [libvirt PATCH] docs: replace ARRAY_CARDINALITY with G_N_ELEMENTS
In-Reply-To: <20220713110747.1611884-1-berrange@redhat.com>
References: <20220713110747.1611884-1-berrange@redhat.com>
Message-ID: <Ys6od8pNGgZfrHW8@antique-laptop>

On Wed, Jul 13, 2022 at 12:07:47PM +0100, Daniel P. Berrang? wrote:
> Fix docs illustrating call with an obsolete macro.
> 
> Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
> ---
>  docs/kbase/internals/locking.rst | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/abed318a/attachment.sig>

From mprivozn at redhat.com  Wed Jul 13 13:22:49 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 13 Jul 2022 15:22:49 +0200
Subject: [PATCH v2 0/9] qemu: Enable SCHED_CORE for domains and helper
 processes
In-Reply-To: <cover.1656324035.git.mprivozn@redhat.com>
References: <cover.1656324035.git.mprivozn@redhat.com>
Message-ID: <a92ca437-ab43-4413-841f-80b173b6665a@redhat.com>

On 6/27/22 12:44, Michal Privoznik wrote:
>

Polite ping.

Michal


From mprivozn at redhat.com  Wed Jul 13 13:51:03 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:03 +0200
Subject: [PATCH v2 1/6] tests: Update hostdev-usb-* hostdev-pci-* xml2xml and
 xml2argv tests
In-Reply-To: <cover.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
Message-ID: <94ae42fd25aa3b97559ef1980bf76ca92088a0d4.1657720089.git.mprivozn@redhat.com>

Currently, we have bunch of PCI/USB tests cases for
qemuxml2argvtest and qemuxml2xmltest but all of them run without
any capabilities. This makes is needlessly complicated when
trying to extend them. Switch to DO_TEST_CAPS_LATEST().

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Reviewed-by: J?n Tomko <jtomko at redhat.com>
---
 .../hostdev-pci-address-device.args           | 34 -----------------
 ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-pci-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-pci-address.args | 33 ----------------
 .../hostdev-pci-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-pci-address.xml  |  2 +-
 .../hostdev-usb-address-device-boot.args      | 34 -----------------
 ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device-boot.xml       |  2 +-
 .../hostdev-usb-address-device.args           | 34 -----------------
 ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-usb-address.args | 33 ----------------
 .../hostdev-usb-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-usb-address.xml  |  2 +-
 tests/qemuxml2argvtest.c                      | 10 ++---
 ... => hostdev-pci-address.x86_64-latest.xml} |  7 +++-
 ... => hostdev-usb-address.x86_64-latest.xml} |  7 +++-
 tests/qemuxml2xmltest.c                       |  4 +-
 19 files changed, 210 insertions(+), 184 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%)
 rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (85%)

diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
deleted file mode 100644
index 4c39457ae5..0000000000
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ /dev/null
@@ -1,34 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
new file mode 100644
index 0000000000..a0b6777ce2
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
@@ -0,0 +1,38 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest2,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x3"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
index 7a99fc8444..3fc4d12f7e 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest2'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
deleted file mode 100644
index a985ff9dc1..0000000000
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest2 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-i386 \
--name guest=QEMUGuest2,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--usb \
--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 \
--device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
new file mode 100644
index 0000000000..fe011d5f8a
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
@@ -0,0 +1,37 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-QEMUGuest2 \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest2,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest2/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"vfio-pci","host":"0000:06:12.5","id":"hostdev0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.xml b/tests/qemuxml2argvdata/hostdev-pci-address.xml
index 5f8090336f..f35b8394f7 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest2'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
deleted file mode 100644
index 7e72951fd1..0000000000
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ /dev/null
@@ -1,34 +0,0 @@
-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,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bootindex=1,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
new file mode 100644
index 0000000000..2a5a085231
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
@@ -0,0 +1,38 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bootindex":1,"bus":"usb.0","port":"1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
index ac1360f87f..a3c0618e37 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.xml
@@ -12,7 +12,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
deleted file mode 100644
index c4003864c4..0000000000
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ /dev/null
@@ -1,34 +0,0 @@
-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,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
new file mode 100644
index 0000000000..30809a076c
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
@@ -0,0 +1,38 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
index 9027564584..f63ad30950 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
deleted file mode 100644
index a5bf6263d4..0000000000
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ /dev/null
@@ -1,33 +0,0 @@
-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,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--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 \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=1 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
new file mode 100644
index 0000000000..f59c463f5e
--- /dev/null
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
@@ -0,0 +1,37 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"1"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
index 7d0c338311..03c802a532 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml
@@ -13,7 +13,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index a99b44bf2d..5b40a0d7f5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1914,12 +1914,12 @@ mymain(void)
     DO_TEST_CAPS_LATEST("fs9p");
     DO_TEST_CAPS_ARCH_LATEST("fs9p-ccw", "s390x");
 
-    DO_TEST_NOCAPS("hostdev-usb-address");
-    DO_TEST_NOCAPS("hostdev-usb-address-device");
-    DO_TEST_NOCAPS("hostdev-usb-address-device-boot");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address-device");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address-device-boot");
     DO_TEST_PARSE_ERROR_NOCAPS("hostdev-usb-duplicate");
-    DO_TEST("hostdev-pci-address", QEMU_CAPS_DEVICE_VFIO_PCI);
-    DO_TEST("hostdev-pci-address-device", QEMU_CAPS_DEVICE_VFIO_PCI);
+    DO_TEST_CAPS_LATEST("hostdev-pci-address");
+    DO_TEST_CAPS_LATEST("hostdev-pci-address-device");
     DO_TEST_PARSE_ERROR("hostdev-pci-duplicate",
                         QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-vfio",
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
similarity index 86%
rename from tests/qemuxml2xmloutdata/hostdev-pci-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
index 9ba3dfac45..84d9660316 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.x86_64-latest.xml
@@ -8,19 +8,22 @@
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</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 type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
similarity index 85%
rename from tests/qemuxml2xmloutdata/hostdev-usb-address.xml
rename to tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
index e4a1f798b2..e5e3620971 100644
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
@@ -8,19 +8,22 @@
     <type arch='i686' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <driver name='qemu' type='raw'/>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
       <address type='drive' controller='0' bus='0' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
     <controller type='ide' index='0'>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 71bce98c17..58929b68c1 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -526,8 +526,8 @@ mymain(void)
 
     DO_TEST_NOCAPS("channel-unix-source-path");
 
-    DO_TEST_NOCAPS("hostdev-usb-address");
-    DO_TEST_NOCAPS("hostdev-pci-address");
+    DO_TEST_CAPS_LATEST("hostdev-usb-address");
+    DO_TEST_CAPS_LATEST("hostdev-pci-address");
     DO_TEST("hostdev-pci-address-unassigned", QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-pci-multifunction", QEMU_CAPS_DEVICE_VFIO_PCI);
     DO_TEST("hostdev-vfio", QEMU_CAPS_DEVICE_VFIO_PCI);
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 13 13:51:05 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:05 +0200
Subject: [PATCH v2 3/6] conf: Introduce @guestReset to hostdev's <source/>
In-Reply-To: <cover.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
Message-ID: <68023138b90b062242f0ffe028813f0f28999586.1657720089.git.mprivozn@redhat.com>

Some USB devices have a buggy firmware that either crashes on
device reset, or make the device unusable in some other way.
Fortunately, QEMU offers a way to skip device reset either
completely, or if device is not initialized yet. Expose this
ability to users under:

    <hostdev mode='subsystem' type='usb'>
      <source guestReset='off'/>
    </hostdev>

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Reviewed-by: J?n Tomko <jtomko at redhat.com>
---
 docs/formatdomain.rst                          | 15 ++++++++++++++-
 src/conf/domain_conf.c                         | 18 ++++++++++++++++++
 src/conf/domain_conf.h                         | 13 +++++++++++++
 src/conf/schemas/domaincommon.rng              |  9 +++++++++
 tests/qemuxml2argvdata/hostdev-usb-address.xml |  2 +-
 .../hostdev-usb-address.x86_64-latest.xml      |  2 +-
 6 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 89b627f4bd..3ea094e64c 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -4051,7 +4051,7 @@ for PCI (KVM only) and 1.0.6 for SCSI (KVM only)` :
    ...
    <devices>
      <hostdev mode='subsystem' type='usb'>
-       <source startupPolicy='optional'>
+       <source startupPolicy='optional' guestReset='off'>
          <vendor id='0x1234'/>
          <product id='0xbeef'/>
        </source>
@@ -4231,6 +4231,19 @@ or:
       optional  drop if missing at any start attempt
       ========= =====================================================================
 
+      :since:`Since 8.6.0`, the ``source`` element can contain ``guestReset``
+      attribute with the following value:
+
+      ============= =====================================================
+      off           all guest initiated device reset requests are ignored
+      uninitialized device request is ignored if device is initialized,
+                    otherwise reset is performed
+      on            device is reset on every guest initiated request
+      ============= =====================================================
+
+      This attribute can be helpful when assigning an USB device with a
+      firmware that crashes on reset.
+
    ``pci``
       PCI devices can only be described by their ``address``.
       :since:`Since 6.8.0 (Xen only)` , the ``source`` element of a PCI device
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e80616fe7b..4c7a5a044c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1042,6 +1042,14 @@ VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIProtocol,
               "iscsi",
 );
 
+VIR_ENUM_IMPL(virDomainHostdevSubsysUSBGuestReset,
+              VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_LAST,
+              "default",
+              "off",
+              "uninitialized",
+              "on",
+);
+
 VIR_ENUM_IMPL(virDomainHostdevSubsysSCSIHostProtocol,
               VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_LAST,
               "none",
@@ -5489,6 +5497,11 @@ virDomainHostdevSubsysUSBDefParseXML(xmlNodePtr node,
         return -1;
     virTristateBoolToBool(autoAddress, &usbsrc->autoAddress);
 
+    if (virXMLPropEnum(node, "guestReset",
+                       virDomainHostdevSubsysUSBGuestResetTypeFromString,
+                       VIR_XML_PROP_NONZERO, &usbsrc->guestReset) < 0)
+        return -1;
+
     /* Product can validly be 0, so we need some extra help to determine
      * if it is uninitialized */
     vendorNode = virXPathNode("./vendor", ctxt);
@@ -22989,6 +23002,11 @@ virDomainHostdevDefFormatSubsysUSB(virBuffer *buf,
     if (def->missing && !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
         virBufferAddLit(&sourceAttrBuf, " missing='yes'");
 
+    if (usbsrc->guestReset) {
+        virBufferAsprintf(&sourceAttrBuf, " guestReset='%s'",
+                          virDomainHostdevSubsysUSBGuestResetTypeToString(usbsrc->guestReset));
+    }
+
     if (usbsrc->vendor) {
         virBufferAsprintf(&sourceChildBuf, "<vendor id='0x%.4x'/>\n", usbsrc->vendor);
         virBufferAsprintf(&sourceChildBuf, "<product id='0x%.4x'/>\n", usbsrc->product);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index c56b84683c..90de50c12f 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -233,6 +233,17 @@ typedef enum {
 
 VIR_ENUM_DECL(virDomainHostdevSubsysSCSIProtocol);
 
+typedef enum {
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_DEFAULT = 0,
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_OFF,           /* reset forbidden */
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_UNINITIALIZED, /* reset iff uninitialized */
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_ON,            /* reset allowed */
+
+    VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_LAST
+} virDomainHostdevSubsysUSBGuestReset;
+
+VIR_ENUM_DECL(virDomainHostdevSubsysUSBGuestReset);
+
 struct _virDomainHostdevSubsysUSB {
     bool autoAddress; /* bus/device were filled automatically based
                          on vendor/product */
@@ -241,6 +252,8 @@ struct _virDomainHostdevSubsysUSB {
 
     unsigned vendor;
     unsigned product;
+
+    virDomainHostdevSubsysUSBGuestReset guestReset;
 };
 
 struct _virDomainHostdevSubsysPCI {
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index da2fb0d5cb..faa2561665 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5936,6 +5936,15 @@
       <optional>
         <ref name="startupPolicy"/>
       </optional>
+      <optional>
+        <attribute name="guestReset">
+          <choice>
+            <value>off</value>
+            <value>uninitialized</value>
+            <value>on</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <group>
           <ref name="usbproduct"/>
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.xml b/tests/qemuxml2argvdata/hostdev-usb-address.xml
index 03c802a532..50c02f9b0e 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.xml
@@ -26,7 +26,7 @@
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <hostdev mode='subsystem' type='usb' managed='no'>
-      <source>
+      <source guestReset='uninitialized'>
         <address bus='14' device='6'/>
       </source>
     </hostdev>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
index e5e3620971..2e927252a8 100644
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.x86_64-latest.xml
@@ -34,7 +34,7 @@
     <input type='keyboard' bus='ps2'/>
     <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='usb' managed='no'>
-      <source>
+      <source guestReset='uninitialized'>
         <address bus='14' device='6'/>
       </source>
     </hostdev>
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 13 13:51:06 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:06 +0200
Subject: [PATCH v2 4/6] qemu_capabilities: Track usb-host.guest-resets-all
 capability
In-Reply-To: <cover.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
Message-ID: <3dd20f453b3a20bb2cddbce30b1cadc8c57e0466.1657720089.git.mprivozn@redhat.com>

We will need two attributes of usb-host device to set:
guest-reset and guest-resets-all. The former was introduced in
QEMU v4.0.0-rc0~56^2 and the other in v4.2.0-rc1~9^2. Hence,
track the latter only as it's only starting from that commit when
QEMU has both attributes.

Signed-off-by: Michal Privoznik <mprivozn at 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.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 +
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 +
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
 24 files changed, 25 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8586930266..fa8ffd19ca 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
+              "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
     );
 
 
@@ -1459,6 +1460,7 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPCIeRootPort[] =
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBHost[] = {
     { "hostdevice", QEMU_CAPS_USB_HOST_HOSTDEVICE, NULL },
+    { "guest-resets-all", QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSpaprPCIHostBridge[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 6f35ba1485..a409c1272c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
+    QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
 
     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 162ace7b2b..875e491581 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -162,6 +162,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>4002000</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 7c5275210b..428ecd4f42 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -159,6 +159,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>4002000</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 ce5b782afd..725745593c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -127,6 +127,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>4002000</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 9ee4c0534d..6a54c44d79 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -205,6 +205,7 @@
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
   <flag name='virtio-blk.queue-size'/>
+  <flag name='usb-host.guest-resets-all'/>
   <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 29ee31473f..35998cabf0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -174,6 +174,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 1fdec901a6..b8ddf2e9a8 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -180,6 +180,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 3b58e7fece..c49c258255 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -166,6 +166,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index bee5a84cf9..ce297f2ef5 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -214,6 +214,7 @@
   <flag name='virtio-blk.queue-size'/>
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100241</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 070f64cb1c..a49650cbcc 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -218,6 +218,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 8e17532f3a..42a4418a08 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -181,6 +181,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index df02e264d7..d0dd058743 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -185,6 +185,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 7cb4383693..25339f86d9 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -171,6 +171,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index cad4ed40e6..4ff03dbead 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -222,6 +222,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>5002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 4b4cc2d3aa..2d861da97b 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -189,6 +189,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 8c61bf8a84..38acee5f18 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -231,6 +231,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index afd8f606eb..b03c6bfc24 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -236,6 +236,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 86fc46918f..942c0ba169 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -201,6 +201,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 19605d93ae..32f226acbd 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -238,6 +238,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index e24e2235fb..f4d7cbdd10 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -209,6 +209,7 @@
   <flag name='virtio-iommu.boot-bypass'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 83e0f50e3a..2f895294de 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -213,6 +213,7 @@
   <flag name='virtio-iommu.boot-bypass'/>
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 05f844fd5b..17ea778d38 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -243,6 +243,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 3707d9b7c9..5f5c839fea 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -244,6 +244,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
   <flag name='iothread.thread-pool-max'/>
+  <flag name='usb-host.guest-resets-all'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 13 13:51:08 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:08 +0200
Subject: [PATCH v2 6/6] qemu: Generate cmd line for guestReset
In-Reply-To: <cover.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
Message-ID: <f5e339a671de6563cf06acbef135a3ca3f3d94e9.1657720089.git.mprivozn@redhat.com>

QEMU offers two attributes for handling reset requests of an USB
host device: guest-reset and guest-resets-all. When combined they
act as follows:

1) guest-reset=false
   The guest is not allowed to reset the physical USB device.

2) guest-reset=true,guest-resets-all=false
   The guest is allowed to reset the device when it is not yet
   initialized (aka no USB bus address assigned). Usually this results
   in one guest reset being allowed. This is the default behavior.

3) guest-reset=true,guest-resets-all=true
   The guest is allowed to reset the device as it pleases.

Now, there's a clear 1:1 mapping with our representation of
guestReset, so generating cmd line is trivial.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Reviewed-by: J?n Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_command.c                       | 21 +++++++++++++++++++
 .../hostdev-usb-address.x86_64-latest.args    |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b307d3139c..262fffe5fe 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5001,6 +5001,8 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
     unsigned int hostbus = 0;
     unsigned int hostaddr = 0;
     g_autofree char *hostdevice = NULL;
+    virTristateSwitch guestReset = VIR_TRISTATE_SWITCH_ABSENT;
+    virTristateSwitch guestResetsAll = VIR_TRISTATE_SWITCH_ABSENT;
 
     if (!dev->missing) {
         if (usbsrc->bus == 0 && usbsrc->device == 0) {
@@ -5018,6 +5020,23 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
         }
     }
 
+    switch (usbsrc->guestReset) {
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_OFF:
+        guestReset = VIR_TRISTATE_SWITCH_OFF;
+        break;
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_UNINITIALIZED:
+        guestReset = VIR_TRISTATE_SWITCH_ON;
+        guestResetsAll = VIR_TRISTATE_SWITCH_OFF;
+        break;
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_ON:
+        guestReset = VIR_TRISTATE_SWITCH_ON;
+        guestResetsAll = VIR_TRISTATE_SWITCH_ON;
+        break;
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_DEFAULT:
+    case VIR_DOMAIN_HOSTDEV_USB_GUEST_RESET_LAST:
+        break;
+    }
+
     if (virJSONValueObjectAdd(&props,
                               "s:driver", "usb-host",
                               "S:hostdevice", hostdevice,
@@ -5025,6 +5044,8 @@ qemuBuildUSBHostdevDevProps(const virDomainDef *def,
                               "p:hostaddr", hostaddr,
                               "s:id", dev->info->alias,
                               "p:bootindex",  dev->info->bootIndex,
+                              "T:guest-reset", guestReset,
+                              "T:guest-resets-all", guestResetsAll,
                               NULL) < 0)
         return NULL;
 
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
index f59c463f5e..978e6a6e6d 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
@@ -32,6 +32,6 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
 -device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
--device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"usb.0","port":"1"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","guest-reset":true,"guest-resets-all":false,"bus":"usb.0","port":"1"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 13 13:51:04 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:04 +0200
Subject: [PATCH v2 2/6] tests: Fix qemu replies wrt usb-host properties
In-Reply-To: <cover.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
Message-ID: <08b5d4f9be8447ea38197e850fb6833b3b17df6d.1657720089.git.mprivozn@redhat.com>

My commit of v6.9.0-rc1~457 was a bit too harsh. While it served
its purpose (adding usb-host.hostdevice capability) it has a side
effect: because I copied reply from qemu-5.1.0 to older .replies
files one might now think that say qemu-3.1.0 supports both
.guest-reset and .guest-resets-all properties. But in fact it
doesn't. There are three problematic properties:

1) guest-reset, introduced in v4.0.0-rc0~56^2
2) guest-resets-all introduced in v4.2.0-rc1~9^2
3) suppress-remote-wake introduced in v5.0.0-rc0~148^2~4

Remove these properties from versions that could not have had
them.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 15 ---------------
 .../caps_3.1.0.x86_64.replies                     | 15 ---------------
 .../caps_4.0.0.aarch64.replies                    | 10 ----------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 10 ----------
 .../caps_4.0.0.riscv32.replies                    | 10 ----------
 .../caps_4.0.0.riscv64.replies                    | 10 ----------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.replies | 10 ----------
 .../caps_4.0.0.x86_64.replies                     | 10 ----------
 .../caps_4.1.0.x86_64.replies                     | 10 ----------
 .../caps_4.2.0.aarch64.replies                    |  5 -----
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.replies |  5 -----
 .../qemucapabilitiesdata/caps_4.2.0.s390x.replies |  5 -----
 .../caps_4.2.0.x86_64.replies                     |  5 -----
 13 files changed, 120 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
index 5663253798..95dd682e95 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@@ -17325,11 +17325,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17340,16 +17335,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
-    {
-      "default-value": true,
-      "name": "guest-reset",
-      "type": "bool"
-    },
     {
       "name": "bootindex",
       "type": "int32"
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
index 144448783a..6bb6a399f6 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@@ -17167,11 +17167,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17182,16 +17177,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
-    {
-      "default-value": true,
-      "name": "guest-reset",
-      "type": "bool"
-    },
     {
       "name": "bootindex",
       "type": "int32"
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
index aa45d033b6..3107b86a0d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
@@ -17969,11 +17969,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17984,11 +17979,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
index acba6b8363..e5c08f757f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
@@ -17995,11 +17995,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -18010,11 +18005,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index 2f2db7a105..98b2a87645 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@@ -16335,11 +16335,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -16350,11 +16345,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index fca6bd93c0..f938d5b2e3 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@@ -16335,11 +16335,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -16350,11 +16345,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
index 2e69a447b3..7909309522 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
@@ -16279,11 +16279,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -16294,11 +16289,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index 5de9457eed..e355c6ef1c 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@@ -17672,11 +17672,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -17687,11 +17682,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
index 0dadabf948..480f22fd99 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
@@ -18085,11 +18085,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
@@ -18100,11 +18095,6 @@
       "name": "isobsize",
       "type": "uint32"
     },
-    {
-      "default-value": false,
-      "name": "guest-resets-all",
-      "type": "bool"
-    },
     {
       "default-value": true,
       "name": "guest-reset",
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 5321348322..06e00fe169 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -18825,11 +18825,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
index 4ed901c3de..a0d3f217c8 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.replies
@@ -18288,11 +18288,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index 334a10b3c5..e0994fec0f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -16995,11 +16995,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index cd7a5c345c..a201fc2882 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -18659,11 +18659,6 @@
       "name": "hostaddr",
       "type": "uint32"
     },
-    {
-      "default-value": true,
-      "name": "suppress-remote-wake",
-      "type": "bool"
-    },
     {
       "default-value": 2,
       "name": "loglevel",
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 13 13:51:02 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:02 +0200
Subject: [PATCH v2 0/6] conf: Introduce @guestReset to hostdev's <source/>
Message-ID: <cover.1657720089.git.mprivozn@redhat.com>

v2 of:

https://listman.redhat.com/archives/libvir-list/2022-July/232756.html

diff to v2:
- Fixed capabilities files per Jano's review

Michal Pr?vozn?k (6):
  tests: Update hostdev-usb-* hostdev-pci-* xml2xml and xml2argv tests
  tests: Fix qemu replies wrt usb-host properties
  conf: Introduce @guestReset to hostdev's <source/>
  qemu_capabilities: Track usb-host.guest-resets-all capability
  qemu_validate: Validate that QEMU's capable of guestReset
  qemu: Generate cmd line for guestReset

 docs/formatdomain.rst                         | 15 +++++++-
 src/conf/domain_conf.c                        | 18 +++++++++
 src/conf/domain_conf.h                        | 13 +++++++
 src/conf/schemas/domaincommon.rng             |  9 +++++
 src/qemu/qemu_capabilities.c                  |  2 +
 src/qemu/qemu_capabilities.h                  |  1 +
 src/qemu/qemu_command.c                       | 21 ++++++++++
 src/qemu/qemu_validate.c                      |  8 ++++
 .../caps_3.1.0.ppc64.replies                  | 15 --------
 .../caps_3.1.0.x86_64.replies                 | 15 --------
 .../caps_4.0.0.aarch64.replies                | 10 -----
 .../caps_4.0.0.ppc64.replies                  | 10 -----
 .../caps_4.0.0.riscv32.replies                | 10 -----
 .../caps_4.0.0.riscv64.replies                | 10 -----
 .../caps_4.0.0.s390x.replies                  | 10 -----
 .../caps_4.0.0.x86_64.replies                 | 10 -----
 .../caps_4.1.0.x86_64.replies                 | 10 -----
 .../caps_4.2.0.aarch64.replies                |  5 ---
 .../caps_4.2.0.aarch64.xml                    |  1 +
 .../caps_4.2.0.ppc64.replies                  |  5 ---
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  1 +
 .../caps_4.2.0.s390x.replies                  |  5 ---
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |  1 +
 .../caps_4.2.0.x86_64.replies                 |  5 ---
 .../caps_4.2.0.x86_64.xml                     |  1 +
 .../caps_5.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |  1 +
 .../caps_5.0.0.riscv64.xml                    |  1 +
 .../caps_5.0.0.x86_64.xml                     |  1 +
 .../caps_5.1.0.x86_64.xml                     |  1 +
 .../caps_5.2.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |  1 +
 .../caps_5.2.0.riscv64.xml                    |  1 +
 .../caps_5.2.0.x86_64.xml                     |  1 +
 .../caps_6.0.0.aarch64.xml                    |  1 +
 .../caps_6.0.0.x86_64.xml                     |  1 +
 .../caps_6.1.0.x86_64.xml                     |  1 +
 .../caps_6.2.0.aarch64.xml                    |  1 +
 .../caps_6.2.0.x86_64.xml                     |  1 +
 .../caps_7.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
 .../caps_7.0.0.x86_64.xml                     |  1 +
 .../caps_7.1.0.x86_64.xml                     |  1 +
 .../hostdev-pci-address-device.args           | 34 -----------------
 ...tdev-pci-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-pci-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-pci-address.args | 33 ----------------
 .../hostdev-pci-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-pci-address.xml  |  2 +-
 .../hostdev-usb-address-device-boot.args      | 34 -----------------
 ...usb-address-device-boot.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device-boot.xml       |  2 +-
 .../hostdev-usb-address-device.args           | 34 -----------------
 ...tdev-usb-address-device.x86_64-latest.args | 38 +++++++++++++++++++
 .../hostdev-usb-address-device.xml            |  2 +-
 .../qemuxml2argvdata/hostdev-usb-address.args | 33 ----------------
 .../hostdev-usb-address.x86_64-latest.args    | 37 ++++++++++++++++++
 .../qemuxml2argvdata/hostdev-usb-address.xml  |  4 +-
 tests/qemuxml2argvtest.c                      | 10 ++---
 ... => hostdev-pci-address.x86_64-latest.xml} |  7 +++-
 ... => hostdev-usb-address.x86_64-latest.xml} |  9 +++--
 tests/qemuxml2xmltest.c                       |  4 +-
 62 files changed, 320 insertions(+), 307 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-pci-address.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device-boot.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address-device.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.args
 create mode 100644 tests/qemuxml2argvdata/hostdev-usb-address.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{hostdev-pci-address.xml => hostdev-pci-address.x86_64-latest.xml} (86%)
 rename tests/qemuxml2xmloutdata/{hostdev-usb-address.xml => hostdev-usb-address.x86_64-latest.xml} (83%)

-- 
2.35.1


From jtomko at redhat.com  Wed Jul 13 13:52:11 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 15:52:11 +0200
Subject: [PATCH v2 2/6] tests: Fix qemu replies wrt usb-host properties
In-Reply-To: <08b5d4f9be8447ea38197e850fb6833b3b17df6d.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
 <08b5d4f9be8447ea38197e850fb6833b3b17df6d.1657720089.git.mprivozn@redhat.com>
Message-ID: <Ys7OCwzQjxMWHekq@fedora>

On a Wednesday in 2022, Michal Privoznik wrote:
>My commit of v6.9.0-rc1~457 was a bit too harsh. While it served
>its purpose (adding usb-host.hostdevice capability) it has a side
>effect: because I copied reply from qemu-5.1.0 to older .replies
>files one might now think that say qemu-3.1.0 supports both
>.guest-reset and .guest-resets-all properties. But in fact it
>doesn't. There are three problematic properties:
>
>1) guest-reset, introduced in v4.0.0-rc0~56^2
>2) guest-resets-all introduced in v4.2.0-rc1~9^2
>3) suppress-remote-wake introduced in v5.0.0-rc0~148^2~4
>
>Remove these properties from versions that could not have had
>them.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>---
> .../qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 15 ---------------
> .../caps_3.1.0.x86_64.replies                     | 15 ---------------
> .../caps_4.0.0.aarch64.replies                    | 10 ----------
> .../qemucapabilitiesdata/caps_4.0.0.ppc64.replies | 10 ----------
> .../caps_4.0.0.riscv32.replies                    | 10 ----------
> .../caps_4.0.0.riscv64.replies                    | 10 ----------
> .../qemucapabilitiesdata/caps_4.0.0.s390x.replies | 10 ----------
> .../caps_4.0.0.x86_64.replies                     | 10 ----------
> .../caps_4.1.0.x86_64.replies                     | 10 ----------
> .../caps_4.2.0.aarch64.replies                    |  5 -----
> .../qemucapabilitiesdata/caps_4.2.0.ppc64.replies |  5 -----
> .../qemucapabilitiesdata/caps_4.2.0.s390x.replies |  5 -----
> .../caps_4.2.0.x86_64.replies                     |  5 -----
> 13 files changed, 120 deletions(-)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/c18507a3/attachment.sig>

From jtomko at redhat.com  Wed Jul 13 13:52:32 2022
From: jtomko at redhat.com (=?iso-8859-1?B?SuFu?= Tomko)
Date: Wed, 13 Jul 2022 15:52:32 +0200
Subject: [PATCH v2 4/6] qemu_capabilities: Track
 usb-host.guest-resets-all capability
In-Reply-To: <3dd20f453b3a20bb2cddbce30b1cadc8c57e0466.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
 <3dd20f453b3a20bb2cddbce30b1cadc8c57e0466.1657720089.git.mprivozn@redhat.com>
Message-ID: <Ys7OIHQV7oTVxBht@fedora>

On a Wednesday in 2022, Michal Privoznik wrote:
>We will need two attributes of usb-host device to set:
>guest-reset and guest-resets-all. The former was introduced in
>QEMU v4.0.0-rc0~56^2 and the other in v4.2.0-rc1~9^2. Hence,
>track the latter only as it's only starting from that commit when
>QEMU has both attributes.
>
>Signed-off-by: Michal Privoznik <mprivozn at 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.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 +
> tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 +
> tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
> tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
> tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
> tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
> 24 files changed, 25 insertions(+)
>

Reviewed-by: J?n Tomko <jtomko at redhat.com>

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220713/8cd4a4fc/attachment.sig>

From mprivozn at redhat.com  Wed Jul 13 13:51:07 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 13 Jul 2022 15:51:07 +0200
Subject: [PATCH v2 5/6] qemu_validate: Validate that QEMU's capable of
 guestReset
In-Reply-To: <cover.1657720089.git.mprivozn@redhat.com>
References: <cover.1657720089.git.mprivozn@redhat.com>
Message-ID: <3d1839070ee8a77535c1531341cafb898afb4f3e.1657720089.git.mprivozn@redhat.com>

Now that we have a capability, validate that the QEMU we are
talking to has everything we need for guestReset.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Reviewed-by: J?n Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_validate.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 39210ba65b..764d5b029e 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -2543,6 +2543,14 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev,
     if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS) {
         switch ((virDomainHostdevSubsysType) hostdev->source.subsys.type) {
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+            if (hostdev->source.subsys.u.usb.guestReset &&
+                !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("guestReset is not supported with this version of QEMU"));
+                return -1;
+            }
+            break;
+
         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
             break;
 
-- 
2.35.1


From berrange at redhat.com  Wed Jul 13 15:47:34 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 16:47:34 +0100
Subject: [PATCH v2 6/9] virCommand: Introduce APIs for core scheduling
In-Reply-To: <ef149c6e40263cb0f74a3353c021eb8f15b8882c.1656324035.git.mprivozn@redhat.com>
References: <cover.1656324035.git.mprivozn@redhat.com>
 <ef149c6e40263cb0f74a3353c021eb8f15b8882c.1656324035.git.mprivozn@redhat.com>
Message-ID: <Ys7pFuwuK8MyHzHv@redhat.com>

On Mon, Jun 27, 2022 at 12:44:38PM +0200, Michal Privoznik wrote:
> There are two modes of core scheduling that are handy wrt
> virCommand:
> 
> 1) create new trusted group when executing a virCommand
> 
> 2) place freshly executed virCommand into the trusted group of
>    another process.
> 
> Therefore, implement these two new operations as new APIs:
> virCommandSetRunAlone() and virCommandSetRunAmong(),
> respectively.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/libvirt_private.syms |  2 ++
>  src/util/vircommand.c    | 63 ++++++++++++++++++++++++++++++++++++++++
>  src/util/vircommand.h    |  5 ++++
>  3 files changed, 70 insertions(+)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 16:25:07 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 17:25:07 +0100
Subject: [PATCH v2 9/9] qemu: Place helper processes into the same
 trusted group
In-Reply-To: <b8ee5bad51fcbaa04a34ab0c48604131450220b9.1656324035.git.mprivozn@redhat.com>
References: <cover.1656324035.git.mprivozn@redhat.com>
 <b8ee5bad51fcbaa04a34ab0c48604131450220b9.1656324035.git.mprivozn@redhat.com>
Message-ID: <Ys7x43EqFAtbfSkb@redhat.com>

On Mon, Jun 27, 2022 at 12:44:41PM +0200, Michal Privoznik wrote:
> Since the level of trust that QEMU has is the same level of trust
> that helper processes have there's no harm in placing all of them
> into the same group.
> 
> Unfortunately, since these processes are started before QEMU we
> can't use brand new virCommand*() APIs (those are used on hotplug
> though) and have to use the low level virProcess*() APIs.
> 
> Moreover, because there no (kernel) API that would copy cookie
> from one process to another WITHOUT modifying the cookie of the
> process that's doing the copy, we have to fork() and use
> available copy APIs.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_extdevice.c | 120 ++++++++++++++++++++++++++++++++++++++
>  src/qemu/qemu_extdevice.h |   3 +
>  src/qemu/qemu_process.c   |   4 ++
>  3 files changed, 127 insertions(+)
> 
> diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
> index b8e3c1000a..41368a9cea 100644
> --- a/src/qemu/qemu_extdevice.c
> +++ b/src/qemu/qemu_extdevice.c
> @@ -335,3 +335,123 @@ qemuExtDevicesSetupCgroup(virQEMUDriver *driver,
>  
>      return 0;
>  }
> +
> +
> +static int
> +qemuExtDevicesSetupSchedHelper(pid_t ppid G_GNUC_UNUSED,
> +                               void *opaque)
> +{
> +    GSList *pids = opaque;
> +    GSList *next;
> +    pid_t vmPid;
> +
> +    /* The first item on the list is special: it's the PID of the
> +     * QEMU that has the cookie we want to copy to the rest. */
> +    vmPid = GPOINTER_TO_INT(pids->data);
> +    if (virProcessSchedCoreShareFrom(vmPid) < 0) {
> +        virReportSystemError(errno,
> +                             _("Unable to get core group of: %lld"),
> +                             (long long) vmPid);
> +        return -1;
> +    }
> +
> +    VIR_DEBUG("SCHED_CORE: vmPid = %lld", (long long) vmPid);
> +
> +    for (next = pids->next; next; next = next->next) {
> +        pid_t pid = GPOINTER_TO_INT(next->data);
> +
> +        VIR_DEBUG("SCHED_CORE: share to %lld", (long long) pid);
> +        if (virProcessSchedCoreShareTo(pid) < 0) {
> +            virReportSystemError(errno,
> +                                 _("Unable to share core group to: %lld"),
> +                                 (long long) pid);
> +            return -1;
> +        }
> +    }

The helper processes can have many threads, but this virProcessSchedCoreShareTo
call only sets scheduling cookie for a single thread.

It would need to use SCOPE_THREAD_GROUP, except even that is not sufficient
as the helper may have fork+exec'd another helper by this point, and our
call will only affect the first process.

IOW, to set core scheduling cookies on the helpers, we need to set them
upfront at the time we spawn the helper.

IOW, during startup, IIUC, we need to fork  a dummy process solely to
call PR_SCHED_CORE_CREATE. Then when forking anything else, whether a
helper, or QEMU itself, we need to pull the cookie from that dummy
process, and then finally kill that dummy process.

If hotplugging a device, we won't need the dummy process, we can pull
the cookie from the running QEMU.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 17:22:24 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 18:22:24 +0100
Subject: [PATCH v2 7/9] qemu_conf: Introduce a knob to set SCHED_CORE
In-Reply-To: <d9f8a9b788655d47cbb9751024e3329d27797589.1656324035.git.mprivozn@redhat.com>
References: <cover.1656324035.git.mprivozn@redhat.com>
 <d9f8a9b788655d47cbb9751024e3329d27797589.1656324035.git.mprivozn@redhat.com>
Message-ID: <Ys7/ULR3yrvqteEN@redhat.com>

On Mon, Jun 27, 2022 at 12:44:39PM +0200, Michal Privoznik wrote:
> Ideally, we would just pick the best default and users wouldn't
> have to intervene at all. But in some cases it may be handy to
> not bother with SCHED_CORE at all or place helper processes into
> the same group as QEMU. Introduce a knob in qemu.conf to allow
> users control this behaviour.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/libvirtd_qemu.aug         |  1 +
>  src/qemu/qemu.conf.in              | 14 ++++++++++
>  src/qemu/qemu_conf.c               | 42 ++++++++++++++++++++++++++++++
>  src/qemu/qemu_conf.h               | 11 ++++++++
>  src/qemu/test_libvirtd_qemu.aug.in |  1 +
>  5 files changed, 69 insertions(+)
> 
> diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
> index 0f18775121..ed097ea3d9 100644
> --- a/src/qemu/libvirtd_qemu.aug
> +++ b/src/qemu/libvirtd_qemu.aug
> @@ -110,6 +110,7 @@ module Libvirtd_qemu =
>                   | bool_entry "dump_guest_core"
>                   | str_entry "stdio_handler"
>                   | int_entry "max_threads_per_process"
> +                 | str_entry "sched_core"
>  
>     let device_entry = bool_entry "mac_filter"
>                   | bool_entry "relaxed_acs_check"
> diff --git a/src/qemu/qemu.conf.in b/src/qemu/qemu.conf.in
> index 04b7740136..01c7ab5868 100644
> --- a/src/qemu/qemu.conf.in
> +++ b/src/qemu/qemu.conf.in
> @@ -952,3 +952,17 @@
>  # DO NOT use in production.
>  #
>  #deprecation_behavior = "none"
> +
> +# If this is set then QEMU and its threads will run in a separate scheduling
> +# group meaning no other process will share Hyper Threads of a single core with
> +# QEMU. Each QEMU has its own group.
> +#
> +# Possible options are:
> +# "none" - nor QEMU nor any of its helper processes are placed into separate
> +#          scheduling group
> +# "emulator" - (default) only QEMU and its threads (emulator + vCPUs) are
> +#              placed into separate scheduling group, helper proccesses remain
> +#              outside of the group.
> +# "full" - both QEMU and its helper processes are placed into separate
> +#          scheduling group.
> +#sched_core = "emulator"

Talking to the OpenStack Nova maintainers I'm remembering that life is
somewhat more complicated than we have taken into account.

Nova has a variety of tunables along semi-independant axes which can
be combined

 * CPU policy: shared vs dedicated - this is the big one, with overcommit
   being the out of the box default. In both cases they apply CPU
   pinning to the QEMU VM.

   In the case of shared, they pin to allow the VM to float freely
   over all host CPUs, except for a small subset reserved for the host OS.
   This explicitly overcommits host resources.

   In the case of dedicated, they pin to give each vCPU a corresponduing
   unique vCPU. There is broadly no overcommit of vCPUs. non-vCPU threads
   may still overcommit/compete


 * SMT policy: prefer vs isolate vs required 

   For 'prefer', it'll preferentially pick a host with SMT and give
   the VM SMT siblings, but will fallback to non-SMT hosts if not
   possible

   For 'isolate', it'll keep all-but-1 SMT sibling empty of VCPUs
   at all times

   For 'require', it'll mandate a host with SMT and give the VM
   SMT siblings


 * Emulator policy: float vs isolate vs shared

   For 'follow', the emulator threads will float across pCPUs
   assign to the same guest's vCPUs

   For 'isolate', the emulator threads will be pinned to pCPU(s)
   separate from the vCPUs. These pCPU can be chosen in two
   different ways though

      - Each VM is strictly given its own pCPU just for its
        own emulator threads. Typically used with RealTime

      - Each VM is given pCPU(s) for its emulator thread that
        can be shared with other VMs. Typically used with
	non-RealTime


In terms of core scheduling usage

  - For the default  shared model, where all VM CPUs float and
    overcommit, if we enable core scheduling the capacity of
    a host decreases. Biggest impact is if there are many
    guests with odd-CPU counts, OR many guests with even CPU
    counts but with only 1 runnable CPU at a time.

  - When emulator threads policy is 'isolate', our core scheduling
    setup could massively conflict with Nova's emulator placement.
    eg Nova could have given SMT siblings to two different guests
    for their respective emumalator threads. This is not as serious
    a security risk as sharing SMT siblings with VCPUs, as emulator
    thread code is trustworthy, unless QEMU was exploited

    The net result is that even if 2 VMs have their vCPUs runnable
    and host has pCPUs available to run them, one VM can be stalled
    by its emulator thread pinning having an SMT core scheduling
    conflict with the other VM's emulator thread pinning.


Nova can also mix-and-match the above policies between VMs in the
same host.

Finally, the above is all largely focused on VM placement. One thing
to bear in mind is that even if VMs are isolated from SMT siblings,
Nova deployments can still allow host OS processes to co-exist with
vCPU threads on SMT siblings. Our core scheduling impl would prevent
that


The goal for core scheduling  is to make the free-floating overcommit
scenario as safe as dedicated CPU pinning, while retaining the flexibility
of dynamic placement.

Core scheduling is redundant if the mgmt app has given dedicate CPU pinning
to all vCPUS and all other threads.

At the libvirt side though, we don't know whether Nova is doing overcommit
or dedicated CPUs. CPU pinning masks will be given in both cases, the
only difference is that in the dedicated case, the mask is highly likely
only list 1 pCPU bit.  I don't think we want to try to infer intent by
looking at CPU masks though.


What this means is that if we apply core scheduling by default, it needs
to be compatible with the combination of all the above options. On
reflection, I don't think we can achieve that with high enough confidence.

There's a decent case to be made that libvirt's core schedule would be
good for the overcommit case out of the box, even though it has a
capacity impact, but the ability of host OS threads to co-exist with vCPU
threads would be broken. It is clear that applying core scheduling on top
of nova's dedicated CPU pinnning policies can be massively harmful wrt
to emulator threads policies too.


So what I'm thinking is that our set of three options here are not
sufficient, we need more:

  "none" - nor QEMU nor any of its helper processes are placed into separate
           scheduling group

  "vcpus" - only QEMU vCPU threads are placed into a separate scheduling
            group, emulator threads and helper processes remain outside
	    of the group

  "emulator" - only QEMU and its threads (emulator + vCPUs) are
               placed into separate scheduling group, helper proccesses remain
               outside of the group.
  "full" - both QEMU and its helper processes are placed into separate
           scheduling group.


I don't think any of the three core scheduling options is safe enough to
use by default though. They all have a decent chance of causing regressions
for Nova, even though they'll improve security.

So reluctantly I think we need to default to "none" and require opt in.

Given Nova's mix/match of VM placement settings, I also think that a
per-VM XML knob is more likely to be neccessary than we originally
believed. At the very least being able to switch between 'vcpus'
and 'emulator' modes feels reasonably important.

Of course Nova is just one mgmt app, but we can assume that there exists
other apps that will credibly have the same requirements and thus risks
of regressions.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 13 17:25:00 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 13 Jul 2022 18:25:00 +0100
Subject: [PATCH v2 8/9] qemu: Enable SCHED_CORE for domains and helper
 processes
In-Reply-To: <8ab264b5d03d4e731fdbdd780b9d8e87d70372ad.1656324035.git.mprivozn@redhat.com>
References: <cover.1656324035.git.mprivozn@redhat.com>
 <8ab264b5d03d4e731fdbdd780b9d8e87d70372ad.1656324035.git.mprivozn@redhat.com>
Message-ID: <Ys7/7KhIdXb2OZCG@redhat.com>

On Mon, Jun 27, 2022 at 12:44:40PM +0200, Michal Privoznik wrote:
> Despite all mitigations, side channel attacks when two processes
> run at two Hyper Threads of the same core are still possible.
> Fortunately, the Linux kernel came up with a solution: userspace
> can create so called trusted groups, which are sets of processes
> and only processes of the same group can run on sibling Hyper
> Threads. Of course, two processes of different groups can run on
> different cores, because there's no known side channel attack.
> It's only Hyper Threads that are affected.

The next patch deals with helper processes too. I guess the
difference in this patch is that it deals with helper processes
spawned /after/ QEMU, so they can inherit scheduling group at
startup easily, while the next patch has to apply the group
later in startup ?

> 
> Having said that, it's a clear security win for users when
> enabled for QEMU.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_process.c  | 5 +++++
>  src/qemu/qemu_security.c | 4 ++++
>  src/qemu/qemu_virtiofs.c | 3 +++
>  3 files changed, 12 insertions(+)
> 
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 771a623ef7..86c058316f 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -2919,6 +2919,9 @@ qemuProcessStartManagedPRDaemon(virDomainObj *vm)
>       * qemu (so that it shares the same view of the system). */
>      virCommandSetPreExecHook(cmd, qemuProcessStartPRDaemonHook, vm);
>  
> +    if (cfg->schedCore == QEMU_SCHED_CORE_FULL && vm->pid != 0)
> +        virCommandSetRunAmong(cmd, vm->pid);
> +
>      if (virCommandRun(cmd, NULL) < 0)
>          goto cleanup;
>  
> @@ -7634,6 +7637,8 @@ qemuProcessLaunch(virConnectPtr conn,
>          virCommandSetMaxProcesses(cmd, cfg->maxProcesses);
>      if (cfg->maxFiles > 0)
>          virCommandSetMaxFiles(cmd, cfg->maxFiles);
> +    if (cfg->schedCore != QEMU_SCHED_CORE_NONE)
> +        virCommandSetRunAlone(cmd);
>  
>      /* In this case, however, zero means that core dumps should be
>       * disabled, and so we always need to set the limit explicitly */
> diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
> index 3be1766764..badb8fc8ba 100644
> --- a/src/qemu/qemu_security.c
> +++ b/src/qemu/qemu_security.c
> @@ -683,6 +683,8 @@ qemuSecurityCommandRun(virQEMUDriver *driver,
>                         int *exitstatus,
>                         int *cmdret)
>  {
> +    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
> +
>      if (virSecurityManagerSetChildProcessLabel(driver->securityManager,
>                                                 vm->def, cmd) < 0)
>          return -1;
> @@ -691,6 +693,8 @@ qemuSecurityCommandRun(virQEMUDriver *driver,
>          virCommandSetUID(cmd, uid);
>      if (gid != (gid_t) -1)
>          virCommandSetGID(cmd, gid);
> +    if (cfg->schedCore == QEMU_SCHED_CORE_FULL && vm->pid != 0)
> +        virCommandSetRunAmong(cmd, vm->pid);
>  
>      if (virSecurityManagerPreFork(driver->securityManager) < 0)
>          return -1;
> diff --git a/src/qemu/qemu_virtiofs.c b/src/qemu/qemu_virtiofs.c
> index 2fd4b9f987..faf8fedc0c 100644
> --- a/src/qemu/qemu_virtiofs.c
> +++ b/src/qemu/qemu_virtiofs.c
> @@ -252,6 +252,9 @@ qemuVirtioFSStart(virQEMUDriver *driver,
>      virCommandNonblockingFDs(cmd);
>      virCommandDaemonize(cmd);
>  
> +    if (cfg->schedCore == QEMU_SCHED_CORE_FULL && vm->pid != 0)
> +        virCommandSetRunAmong(cmd, vm->pid);
> +
>      if (qemuExtDeviceLogCommand(driver, vm, cmd, "virtiofsd") < 0)
>          goto error;
>  
> -- 
> 2.35.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From natto at weirdnatto.in  Thu Jul 14 05:48:53 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Thu, 14 Jul 2022 11:18:53 +0530
Subject: [PATCH 0/3] qemu: add an API for "query-stats" QMP command
Message-ID: <20220714054856.1272766-1-natto@weirdnatto.in>

QEMU is gaining introspectable statistics which can be queried via the
"query-stats" QMP command. This patchset aims to add an API for the
same.

The returned JSON for "query-stats" is an array of objects containing
their own respective array of statistics.

Patch 1 adds the API which returns the deserialized JSON in the form of
a GPtrArray of GHashTables.

Patch 2 adds the "query-stats" to QEMU capabilities.

Patch 3 uses the API to query the halt poll success time and the halt
poll failure time.

v2 -> v3
========
Sorry for the late patchset, I was under the impression I had sent it on
Monday but apparently, I did not.

[1/3]:
  - use a single enum for all the statistics.
  - use QEMU_MONITOR_QUERY_STATS_NAME_LAST as the sentinel value for the
    provider constructor.
  - relevant changes to enum values.

[2/3]:
  - fix comment spacing

[3/3]
  - better checks


v1 -> v2
========
I have been tinkering with the v1 patchset and have rewrote the v2
patches a couple of times. I believe the current patchset is still not
perfect and would appreciate some reviews.

I have another patch or two written but they do not make any significant
changes to the current patchset.

[1/3]:
  - use virBitmap instead of an array of strings for statistics.
  - add enums for the stat names and add
    qemuMonitorQueryStatsNameTypeToString to switch between the
    "ToString" functions based on the target type.
  - change qemuMonitorQueryStatsProviderNew to a variadic function that
    takes stat enum values with the sentinel value being -1.

[2/3]:
  - No changes

[3/3]:
  - Add relevant monitor related checks to check if the domain is
    active.
  - Acquire and release qemuMonitorObj lock before and after calling
    qemuMonitorQueryStats respectively.
  - Add the check for privileged access.

Relevant QEMU patches can be found here:
https://lore.kernel.org/all/20220530150714.756954-1-pbonzini at redhat.com/

This patchset is part of the 2022 GSOC contributor project.

Amneesh Singh (3):
  qemu_monitor: add qemuMonitorQueryStats
  qemu_capabilities: add "query-stats" QMP command to the QEMU
    capabilities
  qemu_driver: use qemuMonitorQueryStats to extract halt poll time

 src/qemu/qemu_capabilities.c |   2 +
 src/qemu/qemu_capabilities.h |   1 +
 src/qemu/qemu_driver.c       |  69 ++++++++++++++++---
 src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
 src/qemu/qemu_monitor.h      |  45 ++++++++++++
 src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   6 ++
 7 files changed, 315 insertions(+), 8 deletions(-)

-- 
2.36.1


From natto at weirdnatto.in  Thu Jul 14 05:52:01 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Thu, 14 Jul 2022 11:22:01 +0530
Subject: [PATCH 0/3] qemu: add an API for "query-stats" QMP command
Message-ID: <20220714055204.1277661-1-natto@weirdnatto.in>

QEMU is gaining introspectable statistics which can be queried via the
"query-stats" QMP command. This patchset aims to add an API for the
same.

The returned JSON for "query-stats" is an array of objects containing
their own respective array of statistics.

Patch 1 adds the API which returns the deserialized JSON in the form of
a GPtrArray of GHashTables.

Patch 2 adds the "query-stats" to QEMU capabilities.

Patch 3 uses the API to query the halt poll success time and the halt
poll failure time.

v2 -> v3
========
Sorry for the late patchset, I was under the impression I had sent it on
Monday but apparently, I did not.

[1/3]:
  - use a single enum for all the statistics.
  - use QEMU_MONITOR_QUERY_STATS_NAME_LAST as the sentinel value for the
    provider constructor.
  - relevant changes to enum values.

[2/3]:
  - fix comment spacing

[3/3]
  - better checks


v1 -> v2
========
I have been tinkering with the v1 patchset and have rewrote the v2
patches a couple of times. I believe the current patchset is still not
perfect and would appreciate some reviews.

I have another patch or two written but they do not make any significant
changes to the current patchset.

[1/3]:
  - use virBitmap instead of an array of strings for statistics.
  - add enums for the stat names and add
    qemuMonitorQueryStatsNameTypeToString to switch between the
    "ToString" functions based on the target type.
  - change qemuMonitorQueryStatsProviderNew to a variadic function that
    takes stat enum values with the sentinel value being -1.

[2/3]:
  - No changes

[3/3]:
  - Add relevant monitor related checks to check if the domain is
    active.
  - Acquire and release qemuMonitorObj lock before and after calling
    qemuMonitorQueryStats respectively.
  - Add the check for privileged access.

Relevant QEMU patches can be found here:
https://lore.kernel.org/all/20220530150714.756954-1-pbonzini at redhat.com/

This patchset is part of the 2022 GSOC contributor project.


Amneesh Singh (3):
  qemu_monitor: add qemuMonitorQueryStats
  qemu_capabilities: add "query-stats" QMP command to the QEMU
    capabilities
  qemu_driver: use qemuMonitorQueryStats to extract halt poll time

 src/qemu/qemu_capabilities.c |   2 +
 src/qemu/qemu_capabilities.h |   1 +
 src/qemu/qemu_driver.c       |  69 ++++++++++++++++---
 src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
 src/qemu/qemu_monitor.h      |  45 ++++++++++++
 src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   6 ++
 7 files changed, 315 insertions(+), 8 deletions(-)

-- 
2.36.1


From natto at weirdnatto.in  Thu Jul 14 05:52:03 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Thu, 14 Jul 2022 11:22:03 +0530
Subject: [PATCH 2/3] qemu_capabilities: add "query-stats" QMP command to the
 QEMU capabilities
In-Reply-To: <20220714055204.1277661-1-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
Message-ID: <20220714055204.1277661-3-natto@weirdnatto.in>

Related: https://gitlab.com/libvirt/libvirt/-/issues/276

This patch adds "query-stats" to the QEMU capabilities.

Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
---
 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 fa8ffd19..9835dc82 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -672,6 +672,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
               "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
+              "query-stats", /* QEMU_CAPS_QUERY_STATS */
     );
 
 
@@ -1226,6 +1227,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE },
     { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET },
     { "calc-dirty-rate", QEMU_CAPS_CALC_DIRTY_RATE },
+    { "query-stats", QEMU_CAPS_QUERY_STATS },
 };
 
 struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a409c127..62b28288 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -651,6 +651,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
     QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
+    QEMU_CAPS_QUERY_STATS,  /* accepts query-stats */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
-- 
2.36.1


From natto at weirdnatto.in  Thu Jul 14 05:52:04 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Thu, 14 Jul 2022 11:22:04 +0530
Subject: [PATCH 3/3] qemu_driver: use qemuMonitorQueryStats to extract halt
 poll time
In-Reply-To: <20220714055204.1277661-1-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
Message-ID: <20220714055204.1277661-4-natto@weirdnatto.in>

Related: https://gitlab.com/libvirt/libvirt/-/issues/276

This patch uses qemuMonitorQueryStats to query "halt_poll_success_ns"
and "halt_poll_fail_ns" for every vCPU. The respective values for each
vCPU are then added together.

Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
---
 src/qemu/qemu_driver.c | 69 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index da95f947..e1c595e5 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18066,15 +18066,68 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom,
 }
 
 static int
-qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom,
-                                  virTypedParamList *params)
+qemuDomainGetStatsCpuHaltPollTime(virQEMUDriver *driver,
+                                  virDomainObj *dom,
+                                  virTypedParamList *params,
+                                  unsigned int privflags)
 {
     unsigned long long haltPollSuccess = 0;
     unsigned long long haltPollFail = 0;
-    pid_t pid = dom->pid;
+    qemuDomainObjPrivate *priv = dom->privateData;
+    bool queryStatsCap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_STATS);
 
-    if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
-        return 0;
+    if (queryStatsCap && HAVE_JOB(privflags) && virDomainObjIsActive(dom)) {
+        size_t i;
+        qemuMonitorQueryStatsTargetType target = QEMU_MONITOR_QUERY_STATS_TARGET_VCPU;
+        qemuMonitorQueryStatsProvider *provider = NULL;
+        g_autoptr(GPtrArray) providers = NULL;
+        g_autoptr(GPtrArray) queried_stats = NULL;
+        provider = qemuMonitorQueryStatsProviderNew(
+            QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
+            QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS,
+            QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS,
+            QEMU_MONITOR_QUERY_STATS_NAME_LAST);
+
+        providers = g_ptr_array_new_full(1, (GDestroyNotify) qemuMonitorQueryStatsProviderFree);
+        g_ptr_array_add(providers, provider);
+
+        qemuDomainObjEnterMonitor(driver, dom);
+        queried_stats = qemuMonitorQueryStats(priv->mon, target, NULL, providers);
+        qemuDomainObjExitMonitor(dom);
+
+        if (!queried_stats)
+            return 0;
+
+        for (i = 0; i < queried_stats->len; i++) {
+            unsigned long long curHaltPollSuccess, curHaltPollFail;
+            GHashTable *cur_table = queried_stats->pdata[i];
+            virJSONValue *success_obj, *fail_obj;
+            const char *success_str = qemuMonitorQueryStatsNameTypeToString(
+                QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS);
+            const char *fail_str = qemuMonitorQueryStatsNameTypeToString(
+                QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS);
+
+            success_obj = g_hash_table_lookup(cur_table, success_str);
+            fail_obj = g_hash_table_lookup(cur_table, fail_str);
+
+            if (!success_obj || !fail_obj)
+                return 0;
+
+            if (virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess) < 0)
+                return 0;
+
+            if (virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail) < 0)
+                return 0;
+
+            haltPollSuccess += curHaltPollSuccess;
+            haltPollFail += curHaltPollFail;
+        }
+    } else {
+        pid_t pid = dom->pid;
+
+        if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
+            return 0;
+    }
 
     if (virTypedParamListAddULLong(params, haltPollSuccess, "cpu.haltpoll.success.time") < 0 ||
         virTypedParamListAddULLong(params, haltPollFail, "cpu.haltpoll.fail.time") < 0)
@@ -18087,7 +18140,7 @@ static int
 qemuDomainGetStatsCpu(virQEMUDriver *driver,
                       virDomainObj *dom,
                       virTypedParamList *params,
-                      unsigned int privflags G_GNUC_UNUSED)
+                      unsigned int privflags)
 {
     if (qemuDomainGetStatsCpuCgroup(dom, params) < 0)
         return -1;
@@ -18095,7 +18148,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver,
     if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0)
         return -1;
 
-    if (qemuDomainGetStatsCpuHaltPollTime(dom, params) < 0)
+    if (qemuDomainGetStatsCpuHaltPollTime(driver, dom, params, privflags) < 0)
         return -1;
 
     return 0;
@@ -18929,7 +18982,7 @@ static virQEMUCapsFlags queryDirtyRateRequired[] = {
 
 static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = {
     { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false, NULL },
-    { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false, NULL },
+    { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, true, NULL },
     { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true, NULL },
     { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true, NULL },
     { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false, NULL },
-- 
2.36.1


From natto at weirdnatto.in  Thu Jul 14 05:52:02 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Thu, 14 Jul 2022 11:22:02 +0530
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <20220714055204.1277661-1-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
Message-ID: <20220714055204.1277661-2-natto@weirdnatto.in>

Related: https://gitlab.com/libvirt/libvirt/-/issues/276

This patch adds an API for the "query-stats" QMP command.

The query returns a JSON containing the statistics based on the target,
which can either be vCPU or VM, and the providers. The API deserializes
the query result into an array of GHashMaps, which can later be used to
extract all the query statistics. GHashMaps are used to avoid traversing
the entire array to find the statistics you are looking for. This would
be a singleton array if the target is a VM since the returned JSON is
also a singleton array in that case.

Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
---
 src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
 src/qemu/qemu_monitor.h      |  45 ++++++++++++
 src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   6 ++
 4 files changed, 251 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fda5d2f3..a07e6017 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4541,3 +4541,73 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONMigrateRecover(mon, uri);
 }
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
+              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
+              "vm",
+              "vcpu",
+);
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsName,
+              QEMU_MONITOR_QUERY_STATS_NAME_LAST,
+              "halt_poll_success_ns",
+              "halt_poll_fail_ns"
+);
+
+VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
+              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
+              "kvm",
+);
+
+void
+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
+{
+    virBitmapFree(provider->names);
+    g_free(provider);
+}
+
+qemuMonitorQueryStatsProvider *
+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType provider_type,
+                                 ...)
+{
+    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
+    qemuMonitorQueryStatsNameType stat;
+    va_list name_list;
+    size_t sentinel = QEMU_MONITOR_QUERY_STATS_NAME_LAST;
+
+    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
+    provider->provider = provider_type;
+    provider->names = NULL;
+
+    va_start(name_list, provider_type);
+    stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
+
+    if (stat != sentinel) {
+        provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
+
+        while (stat != sentinel) {
+            if (virBitmapSetBit(provider->names, stat) < 0)
+                return NULL;
+            stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
+        }
+    }
+    va_end(name_list);
+
+    return g_steal_pointer(&provider);
+}
+
+GPtrArray *
+qemuMonitorQueryStats(qemuMonitor *mon,
+                      qemuMonitorQueryStatsTargetType target,
+                      char **vcpus,
+                      GPtrArray *providers)
+{
+    VIR_DEBUG("target=%u vcpus=%p providers=%p", target, vcpus, providers);
+
+    QEMU_CHECK_MONITOR_NULL(mon);
+
+    if (target != QEMU_MONITOR_QUERY_STATS_TARGET_VCPU && vcpus)
+        return NULL;
+
+    return qemuMonitorJSONQueryStats(mon, target, vcpus, providers);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 95267ec6..344636e1 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1554,3 +1554,48 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorMigrateRecover(qemuMonitor *mon,
                           const char *uri);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_TARGET_VM,
+    QEMU_MONITOR_QUERY_STATS_TARGET_VCPU,
+    QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
+} qemuMonitorQueryStatsTargetType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsTarget);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS,
+    QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS,
+    QEMU_MONITOR_QUERY_STATS_NAME_LAST,
+} qemuMonitorQueryStatsNameType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsName);
+
+typedef enum {
+    QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
+    QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
+} qemuMonitorQueryStatsProviderType;
+
+VIR_ENUM_DECL(qemuMonitorQueryStatsProvider);
+
+typedef struct _qemuMonitorQueryStatsProvider qemuMonitorQueryStatsProvider;
+struct _qemuMonitorQueryStatsProvider {
+    qemuMonitorQueryStatsProviderType provider;
+    virBitmap *names;
+};
+
+void
+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider);
+
+qemuMonitorQueryStatsProvider *
+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType provider_type,
+                                 ...);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorQueryStatsProvider,
+                              qemuMonitorQueryStatsProviderFree);
+
+GPtrArray *
+qemuMonitorQueryStats(qemuMonitor *mon,
+                      qemuMonitorQueryStatsTargetType target,
+                      char **vcpus,
+                      GPtrArray *providers);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 80696de7..4e228bfb 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -9031,3 +9031,133 @@ qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONCheckError(cmd, reply);
 }
+
+static GPtrArray *
+qemuMonitorJSONExtractQueryStats(virJSONValue *arr)
+{
+    g_autoptr(GPtrArray) queried_stats = NULL;
+    size_t nstats = virJSONValueArraySize(arr);
+    size_t i;
+
+    /* Create a GPtrArray for GHashTables */
+    queried_stats = g_ptr_array_new_full(nstats, (GDestroyNotify) g_hash_table_destroy);
+
+    for (i = 0; i < nstats; i++) {
+        virJSONValue *obj = virJSONValueArrayGet(arr, i);
+        virJSONValue *stats = virJSONValueObjectGetArray(obj, "stats");
+        size_t j;
+
+        /* Create a GHashTable for virJSONValues */
+        GHashTable *hash_table = virHashNew((GDestroyNotify) virJSONValueFree);
+
+        for (j = 0; j < virJSONValueArraySize(stats); j++) {
+            virJSONValue *stat = virJSONValueArrayGet(stats, j);
+
+            g_hash_table_insert(hash_table,
+                                g_strdup(virJSONValueObjectGetString(stat, "name")),
+                                virJSONValueObjectGet(stat, "value"));
+        }
+
+        g_ptr_array_add(queried_stats, hash_table);
+    }
+
+    return g_steal_pointer(&queried_stats);
+}
+
+
+/**
+ * qemuMonitorJSONQueryStats:
+ * @mon: monitor object
+ * @target: the target type for the query
+ * @vcpus: a list of vCPU QOM paths for filtering the statistics
+ * @providers: an array of providers to filter statistics
+ *
+ * @vcpus is a NULL terminated array of strings. @providers is a GPtrArray
+ * for qemuMonitorQueryStatsProvider.
+ * @vcpus and @providers are optional and can be NULL.
+ *
+ * Queries for the @target based statistics.
+ * Returns a GPtrArray of GHashTables containing the statistics on success or
+ * NULL on failure.
+ */
+
+GPtrArray *
+qemuMonitorJSONQueryStats(qemuMonitor *mon,
+                          qemuMonitorQueryStatsTargetType target,
+                          char **vcpus,
+                          GPtrArray *providers)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    g_autoptr(virJSONValue) vcpu_list = NULL;
+    g_autoptr(virJSONValue) provider_list = NULL;
+    virJSONValue *rv = NULL;
+
+    size_t i;
+
+    if (providers) {
+        provider_list = virJSONValueNewArray();
+
+        for (i = 0; i < providers->len; i++) {
+            g_autoptr(virJSONValue) provider_obj = virJSONValueNewObject();
+            qemuMonitorQueryStatsProvider *provider = providers->pdata[i];
+            const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->provider);
+            virBitmap *names = provider->names;
+            int rc;
+
+            rc = virJSONValueObjectAppendString(provider_obj, "provider", type_str);
+
+            if (rc < 0)
+                return NULL;
+
+            if (names) {
+                g_autoptr(virJSONValue) provider_names = virJSONValueNewArray();
+                int curBit = virBitmapNextSetBit(names, -1);
+
+                while (curBit >= 0) {
+                    const char *name = qemuMonitorQueryStatsNameTypeToString(curBit);
+
+                    if (virJSONValueArrayAppendString(provider_names, name) < 0)
+                        return NULL;
+
+                    curBit = virBitmapNextSetBit(names, curBit);
+                }
+
+                rc = virJSONValueObjectAppend(provider_obj, "names", &provider_names);
+
+                if (rc < 0)
+                    return NULL;
+            }
+
+            if (virJSONValueArrayAppend(provider_list, &provider_obj) < 0)
+                return NULL;
+        }
+    }
+
+    if (vcpus) {
+        vcpu_list = virJSONValueNewArray();
+
+        for (i = 0; vcpus[i]; i++)
+            if (virJSONValueArrayAppendString(vcpu_list, vcpus[i]) < 0)
+                return NULL;
+    }
+
+    cmd = qemuMonitorJSONMakeCommand("query-stats",
+                                     "s:target", qemuMonitorQueryStatsTargetTypeToString(target),
+                                     "A:vcpus", &vcpu_list,
+                                     "A:providers", &provider_list,
+                                     NULL);
+
+    if (!cmd)
+        return NULL;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return NULL;
+
+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+        return NULL;
+
+    rv = virJSONValueObjectStealArray(reply, "return");
+
+    return qemuMonitorJSONExtractQueryStats(rv);
+}
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index ad3853ae..db8dec80 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -878,3 +878,9 @@ qemuMonitorJSONChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
                               const char *uri);
+
+GPtrArray *
+qemuMonitorJSONQueryStats(qemuMonitor *mon,
+                          qemuMonitorQueryStatsTargetType target,
+                          char **vcpus,
+                          GPtrArray *providers);
-- 
2.36.1


From anthony.pighin at nokia.com  Mon Jul 11 18:14:14 2022
From: anthony.pighin at nokia.com (Pighin, Anthony (Nokia - CA/Ottawa))
Date: Mon, 11 Jul 2022 18:14:14 +0000
Subject: Persistent Failed to attach device following transient Failed to read
 product/vendor ID
Message-ID: <BN0PR08MB695119D1DCEC73989C8F959483879@BN0PR08MB6951.namprd08.prod.outlook.com>

I'm attempting to solve the issue reported here:

https://gitlab.com/libvirt/libvirt/-/issues/345

Hoping the originator of virHostdevDeleteMissingPCIDevices() will be able to comment, as I am still trying to reproduce the issue with additional debug in place.

diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
index c0ce867596..d43354963e 100644
--- a/src/hypervisor/virhostdev.c
+++ b/src/hypervisor/virhostdev.c
@@ -1101,11 +1101,11 @@ virHostdevReAttachPCIDevices(virHostdevManager *mgr,
         VIR_ERROR(_("Failed to allocate PCI device list: %s"),
                   virGetLastErrorMessage());
         virResetLastError();
-        return;
     }
-
-    virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs,
-                                     hostdevs, nhostdevs);
+    else {
+        virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs,
+                                        hostdevs, nhostdevs);
+    }

     /* Handle the case where PCI devices from the host went missing
      * during the domain lifetime */


From jjongsma at redhat.com  Thu Jul 14 14:52:25 2022
From: jjongsma at redhat.com (Jonathon Jongsma)
Date: Thu, 14 Jul 2022 09:52:25 -0500
Subject: [libvirt PATCH] util: remove virObjectUnref() adapters
Message-ID: <20220714145225.3959236-1-jjongsma@redhat.com>

These wrapper functions were used to adapt the virObjectUnref() function
signature for different callbacks. But in commit 0d184072, the
virObjectUnref() function was changed to return a void instead of a
bool, so these adapters are no longer necessary.

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 src/admin/admin_remote.c             |  4 ++--
 src/bhyve/bhyve_monitor.c            |  2 +-
 src/conf/object_event.c              |  2 +-
 src/conf/virdomainobjlist.c          |  8 ++++----
 src/conf/virinterfaceobj.c           |  2 +-
 src/conf/virnetworkobj.c             |  2 +-
 src/conf/virnodedeviceobj.c          |  2 +-
 src/conf/virnwfilterbindingobjlist.c |  4 ++--
 src/conf/virsecretobj.c              |  2 +-
 src/conf/virstorageobj.c             | 10 +++++-----
 src/libvirt_private.syms             |  2 --
 src/qemu/qemu_domain.c               |  2 +-
 src/remote/remote_daemon_stream.c    |  2 +-
 src/remote/remote_driver.c           |  8 ++++----
 src/rpc/gendispatch.pl               |  2 +-
 src/rpc/virkeepalive.c               |  2 +-
 src/rpc/virnetclient.c               |  4 ++--
 src/rpc/virnetclientstream.c         |  2 +-
 src/rpc/virnetdaemon.c               |  2 +-
 src/rpc/virnetserverclient.c         |  4 ++--
 src/rpc/virnetserverservice.c        |  6 +++---
 src/util/virobject.c                 | 30 ----------------------------
 src/util/virobject.h                 |  6 ------
 tests/qemustatusxml2xmltest.c        |  2 +-
 tests/qemuxml2argvtest.c             |  2 +-
 tests/qemuxml2xmltest.c              |  2 +-
 tools/virsh-console.c                |  6 +++---
 27 files changed, 42 insertions(+), 80 deletions(-)

diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
index 83a6be2b97..012488bff3 100644
--- a/src/admin/admin_remote.c
+++ b/src/admin/admin_remote.c
@@ -165,7 +165,7 @@ remoteAdminConnectOpen(virAdmConnectPtr conn, unsigned int flags)
     virObjectRef(conn->closeCallback);
     virNetClientSetCloseCallback(priv->client, remoteAdminClientCloseFunc,
                                  conn->closeCallback,
-                                 virObjectFreeCallback);
+                                 virObjectUnref);
 
     if (call(conn, 0, ADMIN_PROC_CONNECT_OPEN,
              (xdrproc_t)xdr_admin_connect_open_args, (char *)&args,
@@ -195,7 +195,7 @@ remoteAdminConnectClose(virAdmConnectPtr conn)
     }
 
     virNetClientSetCloseCallback(priv->client, NULL, conn->closeCallback,
-                                 virObjectFreeCallback);
+                                 virObjectUnref);
     virNetClientClose(priv->client);
 
     rv = 0;
diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c
index 6788b83c70..ae602b5c39 100644
--- a/src/bhyve/bhyve_monitor.c
+++ b/src/bhyve/bhyve_monitor.c
@@ -82,7 +82,7 @@ bhyveMonitorRegister(bhyveMonitor *mon)
                                    VIR_EVENT_HANDLE_HANGUP,
                                    bhyveMonitorIO,
                                    mon,
-                                   virObjectFreeCallback);
+                                   virObjectUnref);
     if (mon->watch < 0) {
         VIR_DEBUG("failed to add event handle for mon %p", mon);
         virObjectUnref(mon);
diff --git a/src/conf/object_event.c b/src/conf/object_event.c
index 3c998eda7f..62bbfb33bc 100644
--- a/src/conf/object_event.c
+++ b/src/conf/object_event.c
@@ -876,7 +876,7 @@ virObjectEventStateRegisterID(virConnectPtr conn,
         if ((state->timer = virEventAddTimeout(-1,
                                                virObjectEventTimer,
                                                state,
-                                               virObjectFreeCallback)) < 0) {
+                                               virObjectUnref)) < 0) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("could not initialize domain event timer"));
             goto cleanup;
diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index f16b963eb0..2569454ff8 100644
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -73,8 +73,8 @@ virDomainObjList *virDomainObjListNew(void)
     if (!(doms = virObjectRWLockableNew(virDomainObjListClass)))
         return NULL;
 
-    doms->objs = virHashNew(virObjectFreeHashData);
-    doms->objsName = virHashNew(virObjectFreeHashData);
+    doms->objs = virHashNew(virObjectUnref);
+    doms->objsName = virHashNew(virObjectUnref);
     return doms;
 }
 
@@ -217,7 +217,7 @@ virDomainObjListFindByName(virDomainObjList *doms,
  * tables. Once successfully added into a table, increase the
  * reference count since upon removal in virHashRemoveEntry
  * the virObjectUnref will be called since the hash tables were
- * configured to call virObjectFreeHashData when the object is
+ * configured to call virObjectUnref when the object is
  * removed from the hash table.
  *
  * Returns 0 on success with 3 references and locked
@@ -453,7 +453,7 @@ virDomainObjListRename(virDomainObjList *doms,
 
     /* Increment the refcnt for @new_name. We're about to remove
      * the @old_name which will cause the refcnt to be decremented
-     * via the virObjectUnref call made during the virObjectFreeHashData
+     * via the virObjectUnref call made during the virObjectUnref
      * as a result of removing something from the object list hash
      * table as set up during virDomainObjListNew. */
     virObjectRef(dom);
diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c
index c2b81b984f..1ec1c9d1b7 100644
--- a/src/conf/virinterfaceobj.c
+++ b/src/conf/virinterfaceobj.c
@@ -140,7 +140,7 @@ virInterfaceObjListNew(void)
     if (!(interfaces = virObjectRWLockableNew(virInterfaceObjListClass)))
         return NULL;
 
-    interfaces->objsName = virHashNew(virObjectFreeHashData);
+    interfaces->objsName = virHashNew(virObjectUnref);
 
     return interfaces;
 }
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index ddb325cdbd..46b499db58 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -326,7 +326,7 @@ virNetworkObjListNew(void)
     if (!(nets = virObjectRWLockableNew(virNetworkObjListClass)))
         return NULL;
 
-    nets->objs = virHashNew(virObjectFreeHashData);
+    nets->objs = virHashNew(virObjectUnref);
 
     return nets;
 }
diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
index 26498fc498..4c22484d11 100644
--- a/src/conf/virnodedeviceobj.c
+++ b/src/conf/virnodedeviceobj.c
@@ -465,7 +465,7 @@ virNodeDeviceObjListNew(void)
     if (!(devs = virObjectRWLockableNew(virNodeDeviceObjListClass)))
         return NULL;
 
-    devs->objs = virHashNew(virObjectFreeHashData);
+    devs->objs = virHashNew(virObjectUnref);
 
     return devs;
 }
diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbindingobjlist.c
index 53713d815a..9a46fa06b9 100644
--- a/src/conf/virnwfilterbindingobjlist.c
+++ b/src/conf/virnwfilterbindingobjlist.c
@@ -66,7 +66,7 @@ virNWFilterBindingObjListNew(void)
     if (!(bindings = virObjectRWLockableNew(virNWFilterBindingObjListClass)))
         return NULL;
 
-    bindings->objs = virHashNew(virObjectFreeHashData);
+    bindings->objs = virHashNew(virObjectUnref);
 
     return bindings;
 }
@@ -131,7 +131,7 @@ virNWFilterBindingObjListFindByPortDev(virNWFilterBindingObjList *bindings,
  * tables. Once successfully added into a table, increase the
  * reference count since upon removal in virHashRemoveEntry
  * the virObjectUnref will be called since the hash tables were
- * configured to call virObjectFreeHashData when the object is
+ * configured to call virObjectUnref when the object is
  * removed from the hash table.
  *
  * Returns 0 on success with 2 references and locked
diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c
index 92985c4b63..4032cd1e9a 100644
--- a/src/conf/virsecretobj.c
+++ b/src/conf/virsecretobj.c
@@ -118,7 +118,7 @@ virSecretObjListNew(void)
     if (!(secrets = virObjectRWLockableNew(virSecretObjListClass)))
         return NULL;
 
-    if (!(secrets->objs = virHashNew(virObjectFreeHashData))) {
+    if (!(secrets->objs = virHashNew(virObjectUnref))) {
         virObjectUnref(secrets);
         return NULL;
     }
diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c
index 238d4678a2..e1465c8376 100644
--- a/src/conf/virstorageobj.c
+++ b/src/conf/virstorageobj.c
@@ -151,9 +151,9 @@ virStorageVolObjListNew(void)
     if (!(vols = virObjectRWLockableNew(virStorageVolObjListClass)))
         return NULL;
 
-    vols->objsKey = virHashNew(virObjectFreeHashData);
-    vols->objsName = virHashNew(virObjectFreeHashData);
-    vols->objsPath = virHashNew(virObjectFreeHashData);
+    vols->objsKey = virHashNew(virObjectUnref);
+    vols->objsName = virHashNew(virObjectUnref);
+    vols->objsPath = virHashNew(virObjectUnref);
 
     return vols;
 }
@@ -378,8 +378,8 @@ virStoragePoolObjListNew(void)
     if (!(pools = virObjectRWLockableNew(virStoragePoolObjListClass)))
         return NULL;
 
-    pools->objs = virHashNew(virObjectFreeHashData);
-    pools->objsName = virHashNew(virObjectFreeHashData);
+    pools->objs = virHashNew(virObjectUnref);
+    pools->objsName = virHashNew(virObjectUnref);
 
     return pools;
 }
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 1e757389e6..f4732f1742 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2978,8 +2978,6 @@ virClassForObjectRWLockable;
 virClassIsDerivedFrom;
 virClassName;
 virClassNew;
-virObjectFreeCallback;
-virObjectFreeHashData;
 virObjectIsClass;
 virObjectListFree;
 virObjectListFreeCount;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 60ed358871..94b2e3118c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1764,7 +1764,7 @@ qemuDomainObjPrivateAlloc(void *opaque)
     if (!(priv->devs = virChrdevAlloc()))
         return NULL;
 
-    priv->blockjobs = virHashNew(virObjectFreeHashData);
+    priv->blockjobs = virHashNew(virObjectUnref);
 
     /* agent commands block by default, user can choose different behavior */
     priv->agentTimeout = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK;
diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_stream.c
index 645be6eafd..912f3f9f94 100644
--- a/src/remote/remote_daemon_stream.c
+++ b/src/remote/remote_daemon_stream.c
@@ -440,7 +440,7 @@ int daemonAddClientStream(virNetServerClient *client,
 
     if (virStreamEventAddCallback(stream->st, 0,
                                   daemonStreamEvent, client,
-                                  virObjectFreeCallback) < 0)
+                                  virObjectUnref) < 0)
         return -1;
 
     virObjectRef(client);
diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 94566069f0..0ca365c4cc 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1096,7 +1096,7 @@ doRemoteOpen(virConnectPtr conn,
     virObjectRef(priv->closeCallback);
     virNetClientSetCloseCallback(priv->client,
                                  remoteClientCloseFunc,
-                                 priv->closeCallback, virObjectFreeCallback);
+                                 priv->closeCallback, virObjectUnref);
 
     if (!(priv->remoteProgram = virNetClientProgramNew(REMOTE_PROGRAM,
                                                        REMOTE_PROTOCOL_VERSION,
@@ -1301,7 +1301,7 @@ doRemoteClose(virConnectPtr conn, struct private_data *priv)
 
     virNetClientSetCloseCallback(priv->client,
                                  NULL,
-                                 priv->closeCallback, virObjectFreeCallback);
+                                 priv->closeCallback, virObjectUnref);
 
     virNetClientClose(priv->client);
     g_clear_pointer(&priv->client, virObjectUnref);
@@ -6142,7 +6142,7 @@ remoteDomainMigratePrepareTunnel3(virConnectPtr dconn,
 
     st->driver = &remoteStreamDrv;
     st->privateData = netst;
-    st->ff = virObjectFreeCallback;
+    st->ff = virObjectUnref;
 
     args.cookie_in.cookie_in_val = (char *)cookiein;
     args.cookie_in.cookie_in_len = cookieinlen;
@@ -7082,7 +7082,7 @@ remoteDomainMigratePrepareTunnel3Params(virConnectPtr dconn,
 
     st->driver = &remoteStreamDrv;
     st->privateData = netst;
-    st->ff = virObjectFreeCallback;
+    st->ff = virObjectUnref;
 
     if (call(dconn, priv, 0, REMOTE_PROC_DOMAIN_MIGRATE_PREPARE_TUNNEL3_PARAMS,
              (xdrproc_t) xdr_remote_domain_migrate_prepare_tunnel3_params_args,
diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
index a64ff3e73f..5f2b163ea0 100755
--- a/src/rpc/gendispatch.pl
+++ b/src/rpc/gendispatch.pl
@@ -1837,7 +1837,7 @@ elsif ($mode eq "client") {
             print "\n";
             print "    st->driver = &remoteStreamDrv;\n";
             print "    st->privateData = netst;\n";
-            print "    st->ff = virObjectFreeCallback;\n";
+            print "    st->ff = virObjectUnref;\n";
         }
 
         if ($call->{ProcName} eq "SupportsFeature") {
diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
index b7ee6fb169..434cc2c7c9 100644
--- a/src/rpc/virkeepalive.c
+++ b/src/rpc/virkeepalive.c
@@ -275,7 +275,7 @@ virKeepAliveStart(virKeepAlive *ka,
         timeout = ka->interval - delay;
     ka->intervalStart = now - (ka->interval - timeout);
     ka->timer = virEventAddTimeout(timeout * 1000, virKeepAliveTimer,
-                                   ka, virObjectFreeCallback);
+                                   ka, virObjectUnref);
     if (ka->timer < 0)
         goto cleanup;
 
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 3f79c03a58..1202b0f30c 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -658,7 +658,7 @@ int virNetClientRegisterAsyncIO(virNetClient *client)
                                   VIR_EVENT_HANDLE_READABLE,
                                   virNetClientIncomingEvent,
                                   client,
-                                  virObjectFreeCallback) < 0) {
+                                  virObjectUnref) < 0) {
         virObjectUnref(client);
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Unable to register async IO callback"));
@@ -688,7 +688,7 @@ int virNetClientRegisterKeepAlive(virNetClient *client)
     if (!(ka = virKeepAliveNew(-1, 0, client,
                                virNetClientKeepAliveSendCB,
                                virNetClientKeepAliveDeadCB,
-                               virObjectFreeCallback)))
+                               virObjectUnref)))
         return -1;
 
     /* keepalive object has a reference to client */
diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c
index a03f67e542..e0e3178111 100644
--- a/src/rpc/virnetclientstream.c
+++ b/src/rpc/virnetclientstream.c
@@ -727,7 +727,7 @@ int virNetClientStreamEventAddCallback(virNetClientStream *st,
          virEventAddTimeout(-1,
                             virNetClientStreamEventTimer,
                             st,
-                            virObjectFreeCallback)) < 0) {
+                            virObjectUnref)) < 0) {
         virObjectUnref(st);
         goto cleanup;
     }
diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c
index ac12d2d412..c4f5bbdce5 100644
--- a/src/rpc/virnetdaemon.c
+++ b/src/rpc/virnetdaemon.c
@@ -142,7 +142,7 @@ virNetDaemonNew(void)
     if (!(dmn = virObjectLockableNew(virNetDaemonClass)))
         return NULL;
 
-    dmn->servers = virHashNew(virObjectFreeHashData);
+    dmn->servers = virHashNew(virObjectUnref);
 
 #ifndef WIN32
     dmn->sigwrite = dmn->sigread = -1;
diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c
index bb70856351..d57ca07167 100644
--- a/src/rpc/virnetserverclient.c
+++ b/src/rpc/virnetserverclient.c
@@ -202,7 +202,7 @@ static int virNetServerClientRegisterEvent(virNetServerClient *client)
                                   mode,
                                   virNetServerClientDispatchEvent,
                                   client,
-                                  virObjectFreeCallback) < 0) {
+                                  virObjectUnref) < 0) {
         virObjectUnref(client);
         return -1;
     }
@@ -1521,7 +1521,7 @@ virNetServerClientInitKeepAlive(virNetServerClient *client,
     if (!(ka = virKeepAliveNew(interval, count, client,
                                virNetServerClientKeepAliveSendCB,
                                virNetServerClientKeepAliveDeadCB,
-                               virObjectFreeCallback)))
+                               virObjectUnref)))
         return -1;
 
     /* keepalive object has a reference to client */
diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c
index 214eae1acb..682b2091c1 100644
--- a/src/rpc/virnetserverservice.c
+++ b/src/rpc/virnetserverservice.c
@@ -152,7 +152,7 @@ virNetServerServiceNewSocket(virNetSocket **socks,
 
     virObjectRef(svc);
     svc->timer = virEventAddTimeout(-1, virNetServerServiceTimerFunc,
-                                    svc, virObjectFreeCallback);
+                                    svc, virObjectUnref);
     if (svc->timer < 0) {
         virObjectUnref(svc);
         goto error;
@@ -169,7 +169,7 @@ virNetServerServiceNewSocket(virNetSocket **socks,
                                       0,
                                       virNetServerServiceAccept,
                                       svc,
-                                      virObjectFreeCallback) < 0) {
+                                      virObjectUnref) < 0) {
             virObjectUnref(svc);
             goto error;
         }
@@ -361,7 +361,7 @@ virNetServerService *virNetServerServiceNewPostExecRestart(virJSONValue *object)
                                       0,
                                       virNetServerServiceAccept,
                                       svc,
-                                      virObjectFreeCallback) < 0) {
+                                      virObjectUnref) < 0) {
             virObjectUnref(svc);
             goto error;
         }
diff --git a/src/util/virobject.c b/src/util/virobject.c
index d1cd4d32f1..b74d74a545 100644
--- a/src/util/virobject.c
+++ b/src/util/virobject.c
@@ -598,36 +598,6 @@ virClassName(virClass *klass)
 }
 
 
-/**
- * virObjectFreeCallback:
- * @opaque: a pointer to a virObject instance
- *
- * Provides identical functionality to virObjectUnref,
- * but with the signature matching the virFreeCallback
- * typedef.
- */
-void virObjectFreeCallback(void *opaque)
-{
-    virObjectUnref(opaque);
-}
-
-
-/**
- * virObjectFreeHashData:
- * @opaque: a pointer to a virObject instance
- * @name: ignored, name of the hash key being deleted
- *
- * Provides identical functionality to virObjectUnref,
- * but with the signature matching the GDestroyNotify
- * typedef used with hash tables.
- */
-void
-virObjectFreeHashData(void *opaque)
-{
-    virObjectUnref(opaque);
-}
-
-
 /**
  * virObjectListFree:
  * @list: A pointer to a NULL-terminated list of object pointers to free
diff --git a/src/util/virobject.h b/src/util/virobject.h
index 4b941ac215..8c06c1b929 100644
--- a/src/util/virobject.h
+++ b/src/util/virobject.h
@@ -104,12 +104,6 @@ virObjectIsClass(void *obj,
                  virClass *klass)
     ATTRIBUTE_NONNULL(2);
 
-void
-virObjectFreeCallback(void *opaque);
-
-void
-virObjectFreeHashData(void *opaque);
-
 void *
 virObjectLockableNew(virClass *klass)
     ATTRIBUTE_NONNULL(1);
diff --git a/tests/qemustatusxml2xmltest.c b/tests/qemustatusxml2xmltest.c
index cd43820551..db82a1a980 100644
--- a/tests/qemustatusxml2xmltest.c
+++ b/tests/qemustatusxml2xmltest.c
@@ -78,7 +78,7 @@ mymain(void)
     int ret = 0;
     g_autofree char *fakerootdir = NULL;
     g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps();
-    g_autoptr(GHashTable) capscache = virHashNew(virObjectFreeHashData);
+    g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref);
     g_autoptr(virConnect) conn = NULL;
     struct testQemuConf testConf = { .capslatest = capslatest,
                                      .capscache = capscache,
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5b40a0d7f5..b2da42cb1f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -835,7 +835,7 @@ mymain(void)
     g_autofree char *fakerootdir = NULL;
     g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps();
     g_autoptr(GHashTable) qapiSchemaCache = virHashNew((GDestroyNotify) g_hash_table_unref);
-    g_autoptr(GHashTable) capscache = virHashNew(virObjectFreeHashData);
+    g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref);
     struct testQemuConf testConf = { .capslatest = capslatest,
                                      .capscache = capscache,
                                      .qapiSchemaCache = qapiSchemaCache };
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 58929b68c1..68e5041bfd 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -122,7 +122,7 @@ mymain(void)
     g_autofree char *fakerootdir = NULL;
     g_autoptr(virQEMUDriverConfig) cfg = NULL;
     g_autoptr(GHashTable) capslatest = testQemuGetLatestCaps();
-    g_autoptr(GHashTable) capscache = virHashNew(virObjectFreeHashData);
+    g_autoptr(GHashTable) capscache = virHashNew(virObjectUnref);
     g_autoptr(virConnect) conn = NULL;
     struct testQemuConf testConf = { .capslatest = capslatest,
                                      .capscache = capscache,
diff --git a/tools/virsh-console.c b/tools/virsh-console.c
index 13ee811a92..6bfb44a190 100644
--- a/tools/virsh-console.c
+++ b/tools/virsh-console.c
@@ -451,7 +451,7 @@ virshRunConsole(vshControl *ctl,
                                              VIR_EVENT_HANDLE_READABLE,
                                              virConsoleEventOnStdin,
                                              con,
-                                             virObjectFreeCallback)) < 0) {
+                                             virObjectUnref)) < 0) {
         virObjectUnref(con);
         goto cleanup;
     }
@@ -461,7 +461,7 @@ virshRunConsole(vshControl *ctl,
                                               0,
                                               virConsoleEventOnStdout,
                                               con,
-                                              virObjectFreeCallback)) < 0) {
+                                              virObjectUnref)) < 0) {
         virObjectUnref(con);
         goto cleanup;
     }
@@ -471,7 +471,7 @@ virshRunConsole(vshControl *ctl,
                                   VIR_STREAM_EVENT_READABLE,
                                   virConsoleEventOnStream,
                                   con,
-                                  virObjectFreeCallback) < 0) {
+                                  virObjectUnref) < 0) {
         virObjectUnref(con);
         goto cleanup;
     }
-- 
2.35.3


From eskultet at redhat.com  Thu Jul 14 15:34:29 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:29 +0200
Subject: [libvirt PATCH v2 04/10] docs: Provide an article on testing
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <23505d4b886d005972649dea44eb1d162e262c03.1657812867.git.eskultet@redhat.com>

Currently we don't have much information on how testing is done in
libvirt and the little we have is scattered among multiple files. This
patch creates a common landing page containing all important bits about
testing in libvirt, providing links to respective sections which
deserve their own articles.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/meson.build |   1 +
 docs/testing.rst | 172 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)
 create mode 100644 docs/testing.rst

diff --git a/docs/meson.build b/docs/meson.build
index 0c7c54a75f..6d61e18385 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -105,6 +105,7 @@ docs_rst_files = [
   'submitting-patches',
   'support',
   'testapi',
+  'testing',
   'testsuites',
   'testtck',
   'uri',
diff --git a/docs/testing.rst b/docs/testing.rst
new file mode 100644
index 0000000000..21abf42080
--- /dev/null
+++ b/docs/testing.rst
@@ -0,0 +1,172 @@
+=======
+Testing
+=======
+
+.. contents::
+
+Different types of tests are available to libvirt developers for testing a
+given libvirt release.
+
+Unit tests
+----------
+
+The unit test suite present in the source code is mainly used to test our
+XML parser/formatter, QEMU command line generator, QEMU capabilities probing,
+etc. It is run by developers before submitting patches upstream and is
+mandatory to pass for any contribution to be accepted upstream. One can run
+the test suite in the source tree with the following::
+
+    $ ninja test
+
+
+Container builds
+----------------
+
+Technically speaking these are not tests in the common sense. However, usage of
+public container images to build libvirt in predefined and widely accessible
+environments makes it possible to expand our coverage across distros,
+architectures, toolchain flavors and library versions and as such is a very
+valuable marker when accepting upstream contributions. Therefore, it is
+recommended to run libvirt builds against your changes in various containers to
+either locally or by using GitLab's shared CI runners to make sure everything
+runs cleanly before submitting your patches. The images themselves come from
+libvirt's GitLab container registry, but this can be overriden if needed, see
+below.
+
+Registry
+~~~~~~~~
+
+Libvirt project has its container registry hosted by GitLab at
+``registry.gitlab.com/libvirt/libvirt`` which will automatically be
+used to pull in pre-built layers. This avoids the need to build all the
+containers locally using the Dockerfile recipes found in ``ci/containers/``.
+
+
+Running container builds with GitLab CI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+As long as your GitLab account has CI minutes available, pipelines will run
+automatically on every branch push to your fork.
+
+Running container builds locally
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to run container builds locally, we have a ``helper`` script inside
+the ``ci`` directory that can pull, build, and test (if applicable) changes on
+your current local branch. It supports both the Docker and Podman runtimes
+with an automatic selection of whichever runtime is configured on your system.
+In case neither has been enabled/configured, please go through the following
+prerequisites. We recommend using podman because of its daemonless architecture
+and security implications (i.e. rootless container execution by default) over
+Docker.
+
+Podman Prerequisites
+~~~~~~~~~~~~~~~~~~~~
+
+Install "podman" with the system package manager.
+
+.. code::
+
+  $ sudo dnf install -y podman
+  $ podman ps
+
+The last command should print an empty table, to verify the system is ready.
+
+Docker Prerequisites
+~~~~~~~~~~~~~~~~~~~~
+
+Install "docker" with the system package manager and start the Docker service
+on your development machine, then make sure you have the privilege to run
+Docker commands. Typically it means setting up passwordless ``sudo docker``
+command or login as root. For example:
+
+.. code::
+
+  $ sudo dnf install -y docker
+  $ # or `apt-get install docker` for Ubuntu, etc.
+  $ sudo systemctl start docker
+  $ sudo docker ps
+
+The last command should print an empty table, to verify the system is ready.
+
+An alternative method to set up permissions is by adding the current user to
+"docker" group and making the docker daemon socket file (by default
+``/var/run/docker.sock``) accessible to the group:
+
+.. code::
+
+  $ sudo groupadd docker
+  $ sudo usermod $USER -a -G docker
+  $ sudo chown :docker /var/run/docker.sock
+
+Note that any one of above configurations makes it possible for the user to
+exploit the whole host with Docker bind mounting or other privileged
+operations.  So only do it on development machines.
+
+Examples of executing local container builds
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+All of the following examples will utilize ``helper`` script mentioned earlier
+sections. Let's start with the basics - listing available container images in
+the default libvirt registry:
+
+::
+
+    $ cd <libvirt_git>/ci
+    $ ./helper --help
+    $ ./helper list-images
+    Available x86 container images:
+
+    ...
+    alpine-edge
+    fedora-rawhide
+    ...
+
+    Available cross-compiler container images:
+
+    ...
+    debian-sid-cross-s390x
+    fedora-rawhide-cross-mingw32
+    fedora-rawhide-cross-mingw64
+    ...
+
+Now let's say one would want to build their local libvirt changes on Alpine
+Edge using their own GitLab's registry container. They'd then proceed with
+
+::
+
+    $ ci/helper build --image-prefix registry.gitlab.com/<user>/libvirt/ci- alpine-edge
+
+Finally, it would be nice if one could get an interactive shell inside the
+test environment to debug potential build issues. This can be achieved with the
+following:
+
+::
+
+    $ ci/helper shell alpine-edge
+
+
+Integration tests
+-----------------
+
+There are a few frameworks for writing and running functional tests in libvirt
+with TCK being the one that runs in our upstream CI.
+
+-  the `TCK test suite <testtck.html>`__ is a functional test suite implemented
+   using the `Perl bindings <https://search.cpan.org/dist/Sys-Virt/>`__ of
+   libvirt. This is the recommended framework to use for writing upstream
+   functional tests at the moment. You can start by cloning the
+   `TCK git repo <https://gitlab.com/libvirt/libvirt-tck>`__.
+
+-  the `Avocado VT <https://github.com/avocado-framework/avocado-vt>`__ test
+   suite with the libvirt plugin is another framework implementing functional
+   testing utilizing the Avocado test framework underneath. Although written in
+   Python, the vast majority of the tests are exercising libvirt through the
+   command line client ``virsh``.
+
+-  the `libvirt-test-API <testapi.html>`__ is also a functional test suite, but
+   implemented using the `Python bindings <python.html>`__ of libvirt.
+   Unfortunately this framework is the least recommended one as it's largely
+   unmaintained and may be completely deprecated in the future in favour of TCK.
+   You can get it by cloning the
+   `git repo <https://gitlab.com/libvirt/libvirt-test-API/>`__.
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:32 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:32 +0200
Subject: [libvirt PATCH v2 07/10] docs: Change the CI headline from "CI
 Testing" to "CI"
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <fbd55a20d2df6856175779111c51ebae88c026cd.1657812867.git.eskultet@redhat.com>

It's not just strategy the master CI article talks (or will talk in the
future) about.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/docs.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs.rst b/docs/docs.rst
index b17d73743a..8ca0afdc1a 100644
--- a/docs/docs.rst
+++ b/docs/docs.rst
@@ -136,8 +136,8 @@ Project development
 `Project strategy <strategy.html>`__
    Sets a vision for future direction & technical choices
 
-`CI Testing <ci.html>`__
-   Details of the Continuous Integration testing strategy
+`CI <ci.html>`__
+   Details on our Continuous Integration
 
 `Bug reports <bugs.html>`__
    How and where to report bugs and request features
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:26 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:26 +0200
Subject: [libvirt PATCH v2 01/10] docs: Move the CI dashboard to its own RST
 module
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <983cf8c03bfbcff4a8898b5003f780b1e4964354.1657812867.git.eskultet@redhat.com>

The dashboard itself simply takes away focus from everything else that
makes sense to have in the CI article, so move it to it's own article
and link it from the main CI article.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/ci-dashboard.rst | 216 ++++++++++++++++++++++++++++++++++++++++++
 docs/ci.rst           | 192 +------------------------------------
 docs/meson.build      |   1 +
 3 files changed, 219 insertions(+), 190 deletions(-)
 create mode 100644 docs/ci-dashboard.rst

diff --git a/docs/ci-dashboard.rst b/docs/ci-dashboard.rst
new file mode 100644
index 0000000000..a7f4e71f96
--- /dev/null
+++ b/docs/ci-dashboard.rst
@@ -0,0 +1,216 @@
+===================
+GitLab CI Dashboard
+===================
+
+The dashboard below shows the current status of the GitLab CI jobs for each
+repository:
+
+Core project
+------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt
+     - .. image:: https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt/pipelines
+          :alt: libvirt pipeline status
+
+
+Language bindings
+-----------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-csharp
+     - .. image:: https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-csharp/pipelines
+          :alt: libvirt-csharp pipeline status
+
+   * - libvirt-go-module
+     - .. image:: https://gitlab.com/libvirt/libvirt-go-module/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-go-module/pipelines
+          :alt: libvirt-go-module pipeline status
+
+   * - libvirt-java
+     - .. image:: https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-java/pipelines
+          :alt: libvirt-java pipeline status
+
+   * - libvirt-ocaml
+     - .. image:: https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-ocaml/pipelines
+          :alt: libvirt-ocaml pipeline status
+
+   * - libvirt-perl
+     - .. image:: https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-perl/pipelines
+          :alt: libvirt-perl pipeline status
+
+   * - libvirt-php
+     - .. image:: https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-php/pipelines
+          :alt: libvirt-php pipeline status
+
+   * - libvirt-python
+     - .. image:: https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-python/pipelines
+          :alt: libvirt-python pipeline status
+
+   * - libvirt-ruby
+     - .. image:: https://gitlab.com/libvirt/libvirt-ruby/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-ruby/pipelines
+          :alt: libvirt-ruby pipeline status
+
+   * - libvirt-rust
+     - .. image:: https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-rust/pipelines
+          :alt: libvirt-rust pipeline status
+
+
+Object mappings
+---------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-cim
+     - .. image:: https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-cim/pipelines
+          :alt: libvirt-cim pipeline status
+
+   * - libvirt-dbus
+     - .. image:: https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-dbus/pipelines
+          :alt: libvirt-dbus pipeline status
+
+   * - libvirt-glib
+     - .. image:: https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-glib/pipelines
+          :alt: libvirt-glib pipeline status
+
+   * - libvirt-go-xml-module
+     - .. image:: https://gitlab.com/libvirt/libvirt-go-xml-module/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-go-xml-module/pipelines
+          :alt: libvirt-go-xml-module pipeline status
+
+   * - libvirt-snmp
+     - .. image:: https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-snmp/pipelines
+          :alt: libvirt-snmp pipeline status
+
+
+Testing
+-------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-ci
+     - .. image:: https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-ci/pipelines
+          :alt: libvirt-ci pipeline status
+
+   * - libvirt-test-API
+     - .. image:: https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-test-API/pipelines
+          :alt: libvirt-test-API pipeline status
+
+   * - libvirt-tck
+     - .. image:: https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-tck/pipelines
+          :alt: libvirt-tck pipeline status
+
+
+Documentation / websites
+------------------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-publican
+     - .. image:: https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-publican/pipelines
+          :alt: libvirt-publican pipeline status
+
+   * - libvirt-appdev-guide-python
+     - .. image:: https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines
+          :alt: libvirt-appdev-guide-python pipeline status
+
+   * - libvirt-wiki
+     - .. image:: https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-wiki/pipelines
+          :alt: libvirt-wiki pipeline status
+
+   * - virttools-planet
+     - .. image:: https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/virttools-planet/pipelines
+          :alt: virttools-planet pipeline status
+
+   * - virttools-web
+     - .. image:: https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/virttools-web/pipelines
+          :alt: virttools-web pipeline status
+
+
+Miscellaneous
+-------------
+
+.. list-table::
+   :widths: 80 20
+   :header-rows: 1
+
+   * - Project
+     - Pipeline
+
+   * - libvirt-console-proxy
+     - .. image:: https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-console-proxy/pipelines
+          :alt: libvirt-console-proxy pipeline status
+
+   * - libvirt-designer
+     - .. image:: https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-designer/pipelines
+          :alt: libvirt-designer pipeline status
+
+   * - libvirt-devaddr
+     - .. image:: https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-devaddr/pipelines
+          :alt: libvirt-devaddr pipeline status
+
+   * - libvirt-sandbox
+     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-sandbox/pipelines
+          :alt: libvirt-sandbox pipeline status
+
+   * - libvirt-sandbox-image
+     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines
+          :alt: libvirt-sandbox-image pipeline status
+
+   * - libvirt-security-notice
+     - .. image:: https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.svg
+          :target: https://gitlab.com/libvirt/libvirt-security-notice/pipelines
+          :alt: libvirt-security-notice pipeline status
diff --git a/docs/ci.rst b/docs/ci.rst
index 71418d74bf..d5282c4d25 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -5,6 +5,8 @@ Libvirt Continuous Integration
 .. contents::
 
 The libvirt project uses GitLab CI for automated testing.
+`Here's <ci-dashboard.html>`__ our CI dashboard which shows the current status
+of our pipelines.
 
 Linux builds and cross-compiled Windows builds happen on GitLab CI's shared
 runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
@@ -13,217 +15,27 @@ runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
 Most of the tooling used to build CI pipelines is maintained as part of the
 `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci>`_ subproject.
 
-GitLab CI Dashboard
-===================
 
-The dashboard below shows the current status of the GitLab CI jobs for each
-repository:
 
-Core project
-------------
 
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
 
-   * - Project
-     - Pipeline
 
-   * - libvirt
-     - .. image:: https://gitlab.com/libvirt/libvirt/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt/pipelines
-          :alt: libvirt pipeline status
 
 
-Language bindings
------------------
 
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
 
-   * - Project
-     - Pipeline
 
-   * - libvirt-csharp
-     - .. image:: https://gitlab.com/libvirt/libvirt-csharp/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-csharp/pipelines
-          :alt: libvirt-csharp pipeline status
 
-   * - libvirt-go-module
-     - .. image:: https://gitlab.com/libvirt/libvirt-go-module/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-go-module/pipelines
-          :alt: libvirt-go-module pipeline status
 
-   * - libvirt-java
-     - .. image:: https://gitlab.com/libvirt/libvirt-java/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-java/pipelines
-          :alt: libvirt-java pipeline status
 
-   * - libvirt-ocaml
-     - .. image:: https://gitlab.com/libvirt/libvirt-ocaml/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-ocaml/pipelines
-          :alt: libvirt-ocaml pipeline status
 
-   * - libvirt-perl
-     - .. image:: https://gitlab.com/libvirt/libvirt-perl/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-perl/pipelines
-          :alt: libvirt-perl pipeline status
 
-   * - libvirt-php
-     - .. image:: https://gitlab.com/libvirt/libvirt-php/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-php/pipelines
-          :alt: libvirt-php pipeline status
 
-   * - libvirt-python
-     - .. image:: https://gitlab.com/libvirt/libvirt-python/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-python/pipelines
-          :alt: libvirt-python pipeline status
 
-   * - libvirt-ruby
-     - .. image:: https://gitlab.com/libvirt/libvirt-ruby/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-ruby/pipelines
-          :alt: libvirt-ruby pipeline status
-
-   * - libvirt-rust
-     - .. image:: https://gitlab.com/libvirt/libvirt-rust/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-rust/pipelines
-          :alt: libvirt-rust pipeline status
 
 
-Object mappings
----------------
 
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
 
-   * - Project
-     - Pipeline
 
-   * - libvirt-cim
-     - .. image:: https://gitlab.com/libvirt/libvirt-cim/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-cim/pipelines
-          :alt: libvirt-cim pipeline status
 
-   * - libvirt-dbus
-     - .. image:: https://gitlab.com/libvirt/libvirt-dbus/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-dbus/pipelines
-          :alt: libvirt-dbus pipeline status
 
-   * - libvirt-glib
-     - .. image:: https://gitlab.com/libvirt/libvirt-glib/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-glib/pipelines
-          :alt: libvirt-glib pipeline status
-
-   * - libvirt-go-xml-module
-     - .. image:: https://gitlab.com/libvirt/libvirt-go-xml-module/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-go-xml-module/pipelines
-          :alt: libvirt-go-xml-module pipeline status
-
-   * - libvirt-snmp
-     - .. image:: https://gitlab.com/libvirt/libvirt-snmp/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-snmp/pipelines
-          :alt: libvirt-snmp pipeline status
-
-
-Testing
--------
-
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
-
-   * - Project
-     - Pipeline
-
-   * - libvirt-ci
-     - .. image:: https://gitlab.com/libvirt/libvirt-ci/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-ci/pipelines
-          :alt: libvirt-ci pipeline status
-
-   * - libvirt-test-API
-     - .. image:: https://gitlab.com/libvirt/libvirt-test-API/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-test-API/pipelines
-          :alt: libvirt-test-API pipeline status
-
-   * - libvirt-tck
-     - .. image:: https://gitlab.com/libvirt/libvirt-tck/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-tck/pipelines
-          :alt: libvirt-tck pipeline status
-
-
-Documentation / websites
-------------------------
-
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
-
-   * - Project
-     - Pipeline
-   * - libvirt-publican
-     - .. image:: https://gitlab.com/libvirt/libvirt-publican/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-publican/pipelines
-          :alt: libvirt-publican pipeline status
-
-   * - libvirt-appdev-guide-python
-     - .. image:: https://gitlab.com/libvirt/libvirt-appdev-guide-python/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-appdev-guide-python/pipelines
-          :alt: libvirt-appdev-guide-python pipeline status
-
-   * - libvirt-wiki
-     - .. image:: https://gitlab.com/libvirt/libvirt-wiki/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-wiki/pipelines
-          :alt: libvirt-wiki pipeline status
-
-   * - virttools-planet
-     - .. image:: https://gitlab.com/libvirt/virttools-planet/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/virttools-planet/pipelines
-          :alt: virttools-planet pipeline status
-
-   * - virttools-web
-     - .. image:: https://gitlab.com/libvirt/virttools-web/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/virttools-web/pipelines
-          :alt: virttools-web pipeline status
-
-
-Miscellaneous
--------------
-
-.. list-table::
-   :widths: 80 20
-   :header-rows: 1
-
-   * - Project
-     - Pipeline
-
-   * - libvirt-console-proxy
-     - .. image:: https://gitlab.com/libvirt/libvirt-console-proxy/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-console-proxy/pipelines
-          :alt: libvirt-console-proxy pipeline status
-
-   * - libvirt-designer
-     - .. image:: https://gitlab.com/libvirt/libvirt-designer/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-designer/pipelines
-          :alt: libvirt-designer pipeline status
-
-   * - libvirt-devaddr
-     - .. image:: https://gitlab.com/libvirt/libvirt-devaddr/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-devaddr/pipelines
-          :alt: libvirt-devaddr pipeline status
-
-   * - libvirt-sandbox
-     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-sandbox/pipelines
-          :alt: libvirt-sandbox pipeline status
-
-   * - libvirt-sandbox-image
-     - .. image:: https://gitlab.com/libvirt/libvirt-sandbox-image/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-sandbox-image/pipelines
-          :alt: libvirt-sandbox-image pipeline status
-
-   * - libvirt-security-notice
-     - .. image:: https://gitlab.com/libvirt/libvirt-security-notice/badges/master/pipeline.svg
-          :target: https://gitlab.com/libvirt/libvirt-security-notice/pipelines
-          :alt: libvirt-security-notice pipeline status
diff --git a/docs/meson.build b/docs/meson.build
index cb70ef6084..fd9df047cb 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -34,6 +34,7 @@ docs_rst_files = [
   'bugs',
   'cgroups',
   'ci',
+  'ci-dashboard',
   'coding-style',
   'committer-guidelines',
   'compiling',
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:31 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:31 +0200
Subject: [libvirt PATCH v2 06/10] docs: Drop the testsuites article
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <258a81eedc2df5558f3b031be4c7c9f533aee69f.1657812867.git.eskultet@redhat.com>

The article was replaced with a new one in previous commit, so we don't
need this one anymore.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/meson.build    |  1 -
 docs/testsuites.rst | 37 -------------------------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 docs/testsuites.rst

diff --git a/docs/meson.build b/docs/meson.build
index 6d61e18385..0b16d64488 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -106,7 +106,6 @@ docs_rst_files = [
   'support',
   'testapi',
   'testing',
-  'testsuites',
   'testtck',
   'uri',
   'windows',
diff --git a/docs/testsuites.rst b/docs/testsuites.rst
deleted file mode 100644
index 4fc733e615..0000000000
--- a/docs/testsuites.rst
+++ /dev/null
@@ -1,37 +0,0 @@
-===========
-Test suites
-===========
-
-There is a few test suites available to developers for testing a given version
-of libvirt:
-
--  the internal test suite: present in the source code, it is run by developers
-   before submitting patches upstream, it is also suggested to have it run and
-   pass as part of the packaging process for distributions. It is run by
-   launching:
-
-   ::
-
-      make check (libvirt 6.6.0 and older)
-
-   ::
-
-      ninja test (libvirt 6.7.0 and newer)
-
-   in a source tree after compilation has finished. It doesn't really make
-   functional testing but checks that large portions of the code not interacting
-   directly with virtualization functions properly.
-
--  the `TCK test suite <testtck.html>`__ is a functional test suite implemented
-   using the `Perl bindings <https://search.cpan.org/dist/Sys-Virt/>`__ of
-   libvirt. It is available separately as a
-   `download <ftp://libvirt.org/libvirt/tck/>`__, as a
-   `package <https://rpmfind.net/linux/rpm2html/search.php?query=libvirt-tck>`__
-   in Fedora distributions, but best is probably to get the `version from
-   GIT <https://gitlab.com/libvirt/libvirt-tck>`__.
-
--  the `libvirt-test-API <testapi.html>`__ is also a functional test suite, but
-   implemented using the `Python bindings <python.html>`__ of libvirt. It is
-   available separately as a
-   `download <ftp://libvirt.org/libvirt/libvirt-test-API/>`__, or directly get
-   the `version from GIT <https://gitlab.com/libvirt/libvirt-test-API/>`__.
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:33 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:33 +0200
Subject: [libvirt PATCH v2 08/10] docs: ci: Add info about the two major types
 of jobs our CI runs
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <c69ebdc766c21f808494f39bc88cb43482ce5f6d.1657812867.git.eskultet@redhat.com>

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci.rst | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/docs/ci.rst b/docs/ci.rst
index d5282c4d25..566bc42db7 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -8,6 +8,9 @@ The libvirt project uses GitLab CI for automated testing.
 `Here's <ci-dashboard.html>`__ our CI dashboard which shows the current status
 of our pipelines.
 
+Builds and unit tests
+=====================
+
 Linux builds and cross-compiled Windows builds happen on GitLab CI's shared
 runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
 <https://cirrus-ci.com/>`_ jobs behind the scenes.
@@ -15,27 +18,25 @@ runners, while FreeBSD and macOS coverage is achieved by triggering `Cirrus CI
 Most of the tooling used to build CI pipelines is maintained as part of the
 `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci>`_ subproject.
 
+Integration tests
+=================
 
+Integration tests in our CI pipelines require dedicated HW which is not
+available to forks, see `GitLab CI Custom Runners <ci-runners.html>`__.
+Therefore, in order to execute the integration tests as part of your libvirt
+fork's GitLab CI you'll need to provide your own runner. You'll also need to
+set a few CI variables to run the integration tests as part of the CI pipeline,
+see below.
 
+GitLab CI variables
+-------------------
 
+* ``LIBVIRT_CI_INTEGRATION`` - enables integration test runs manually or in forks
+* ``LIBVIRT_CI_INTEGRATION_RUNNER_TAG`` - overrides the upstream runner tag on the
 
+Retrieving test logs
+--------------------
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+In case the integration test suite fails in our CI pipelines, a job artifact is
+generated containing Avocado logs, libvirt debug logs, and the latest traceback
+(if one was produced during a daemon's execution).
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:30 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:30 +0200
Subject: [libvirt PATCH v2 05/10] docs: Replace testsuites article with the
 new 'testing' article
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <6ef66b3fea398fe0a5669af42afcd6c83e623b8a.1657812867.git.eskultet@redhat.com>

The new article provides more in-depth information on testing options
in libvirt.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/docs.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/docs.rst b/docs/docs.rst
index 9fd8b7c37e..b17d73743a 100644
--- a/docs/docs.rst
+++ b/docs/docs.rst
@@ -154,10 +154,8 @@ Project development
 `API extensions <api_extension.html>`__
    Adding new public libvirt APIs
 
-`Functional testing <testsuites.html>`__
-   Testing libvirt with
-   `TCK test suite <testtck.html>`__ and
-   `Libvirt-test-API <testapi.html>`__
+`Testing <testing.html>`__
+   Details various types of testing available for libvirt
 
 `New repo setup <newreposetup.html>`__
    Procedure for configuring new git repositories for libvirt
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:35 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:35 +0200
Subject: [libvirt PATCH v2 10/10] docs: ci: Add a brief section on how to run
 the CI workload locally
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <56da5905db133f7f85687d584e2098b13c07309c.1657812867.git.eskultet@redhat.com>

This is just a glue to the testing article introduced in previous
commits.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/ci.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/ci.rst b/docs/ci.rst
index efb1ea295e..ee85018c49 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -49,3 +49,10 @@ provided by the `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci.git>`__ proje
 most relevant changes will need to be introduced to ``lcitool`` first. Please
 follow the instructions outlined
 `here <https://gitlab.com/libvirt/libvirt-ci/-/blob/master/docs/platforms_and_mappings.rst>`__
+
+
+Running CI workloads locally
+============================
+
+If you're interested in running the CI test workloads locally, please read
+our `testing <testing.html>`__ guide.
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:34 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:34 +0200
Subject: [libvirt PATCH v2 09/10] docs: ci: Add a section on how to add a new
 platform to libvirt CI
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <d3b4ec9d6d776df5187b6160495fcd84dad135f5.1657812867.git.eskultet@redhat.com>

Signed-off-by: Erik Skultety <eskultet at redhat.com>
---
 docs/ci.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/ci.rst b/docs/ci.rst
index 566bc42db7..efb1ea295e 100644
--- a/docs/ci.rst
+++ b/docs/ci.rst
@@ -40,3 +40,12 @@ Retrieving test logs
 In case the integration test suite fails in our CI pipelines, a job artifact is
 generated containing Avocado logs, libvirt debug logs, and the latest traceback
 (if one was produced during a daemon's execution).
+
+Adding new OS platforms OR build pre-requisites
+===============================================
+
+Since all of the Dockerfiles libvirt uses for CI have been generated by ``lcitool``
+provided by the `libvirt-ci <https://gitlab.com/libvirt/libvirt-ci.git>`__ project,
+most relevant changes will need to be introduced to ``lcitool`` first. Please
+follow the instructions outlined
+`here <https://gitlab.com/libvirt/libvirt-ci/-/blob/master/docs/platforms_and_mappings.rst>`__
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:25 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:25 +0200
Subject: [libvirt PATCH v2 00/10] docs: Expand documentation on the CI/testing
 topic
Message-ID: <cover.1657812867.git.eskultet@redhat.com>

This series was inspired by QEMU's documentation on CI and focuses on the
following:
- adds documentation on how to add a custom runner to the libvirt project or
  its fork, mainly in context of running functional testing
- replaces the old 'testsuites' article with a more detailed landing page
describing different types of testing available in libvirt
- updates the TCK documentation with details on how TCK should be installed
  and used nowadays

Since v1:
- described the --force argument with TCK usage
- moved the article about adding  new platforms to libvirt-ci and linked it
  from our docs
    -> corresponding MR here: https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/295
    -> ^the MR must merged **FIRST**!

- moved Podman prerequistes for local container builds before Docker

Here's a fresh website pipeline with artifacts:
    https://gitlab.com/eskultety/libvirt/-/jobs/2722840726

Erik Skultety (10):
  docs: Move the CI dashboard to its own RST module
  docs: Provide more information about the TCK test suite
  docs: Provide an article on how to add a custom runner to the project
  docs: Provide an article on testing
  docs: Replace testsuites article with the new 'testing' article
  docs: Drop the testsuites article
  docs: Change the CI headline from "CI Testing" to "CI"
  docs: ci: Add info about the two major types of jobs our CI runs
  docs: ci: Add a section on how to add a new platform to libvirt CI
  docs: ci: Add a brief section on how to run the CI workload locally

 docs/ci-dashboard.rst | 216 ++++++++++++++++++++++++++++++++++++++
 docs/ci-runners.rst   |  86 +++++++++++++++
 docs/ci.rst           | 237 ++++++------------------------------------
 docs/docs.rst         |  10 +-
 docs/meson.build      |   4 +-
 docs/testing.rst      | 172 ++++++++++++++++++++++++++++++
 docs/testsuites.rst   |  37 -------
 docs/testtck.rst      |  99 ++++++++++++++++--
 8 files changed, 602 insertions(+), 259 deletions(-)
 create mode 100644 docs/ci-dashboard.rst
 create mode 100644 docs/ci-runners.rst
 create mode 100644 docs/testing.rst
 delete mode 100644 docs/testsuites.rst

-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:27 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:27 +0200
Subject: [libvirt PATCH v2 02/10] docs: Provide more information about the TCK
 test suite
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <0be5de986a63ce8a6f829d0a429bd4fae07c048f.1657812867.git.eskultet@redhat.com>

Most importantly, how to get it, how install dependencies and how
to run it.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/testtck.rst | 99 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 88 insertions(+), 11 deletions(-)

diff --git a/docs/testtck.rst b/docs/testtck.rst
index 51de095657..6264b40de7 100644
--- a/docs/testtck.rst
+++ b/docs/testtck.rst
@@ -2,6 +2,8 @@
 libvirt TCK : Technology Compatibility Kit
 ==========================================
 
+.. contents::
+
 The libvirt TCK provides a framework for performing testing of the integration
 between libvirt drivers, the underlying virt hypervisor technology, related
 operating system services and system configuration. The idea (and name) is
@@ -23,15 +25,90 @@ determine the level of compatibility of their platform, and evaluate whether it
 will meet their needs, and get awareness of any regressions that may have
 occurred since a previous test run.
 
-For more details you can look at:
-
--  The initial `mail from Daniel
-   Berrange <https://www.redhat.com/archives/libvir-list/2009-April/msg00176.html>`__
-   presenting the project.
--  The `page describing
-   VirtTCK <https://fedoraproject.org/wiki/Features/VirtTCK>`__ the inclusion of
-   libvirt-TCK as a Fedora Feature.
-
 Libvirt-TCK is maintained using `a GIT
-repository <https://gitlab.com/libvirt/libvirt-tck>`__, and comment, patches and
-reviews are carried on the `libvir-list <contact.html>`__ development list.
+repository <https://gitlab.com/libvirt/libvirt-tck>`__. GitLab is also the place
+where the whole TCK development workflow (issues, merge requests, comments)
+happens.
+
+Using TCK
+---------
+
+TCK can be used independently of the enviroment, i.e. both on your local host
+or in a VM. We strongly recommend using a VM for the tests as TCK might affect
+your current host setup, see `Running TCK`_.
+
+Installing dependencies
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Since TCK is based on libvirt Perl bindings, you'll need to have the proper
+version of the bindings installed for the version of libvirt you wish to test
+in order to be able execute the TCK test suite successfully. Additionally, a
+number of Perl dependencies will need to be installed as well, some will be
+available through the system package manager and some will likely need to be
+installed from CPAN (Perl's equivalent of Python's PyPI). Here's where
+`libvirt-ci's <https://gitlab.com/libvirt/libvirt-ci.git>`__ lcitool can help
+with preparing a test environment in a fresh VM, taking care of the
+dependencies along the way:
+
+::
+
+    $ lcitool install --target fedora-36 tck-fedora36 --wait
+
+would get you a new Fedora 36 VM named ``tck-fedora36``. Then
+
+::
+
+    $ lcitool update tck-fedora36 libvirt,libvirt-perl,libvirt-tck+runtime
+
+will install all the necessary dependencies to build libvirt, the corresponding
+Perl bindings and all TCK runtime dependencies to be able to execute the tests.
+We also recommend executing TCK using the Avocado framework as the test harness
+engine which means that you'll have to install Avocado in the test environment
+as well. You can get it either from
+`PyPI <https://pypi.org/project/avocado-framework/>`__ (recommended), or if
+you're on Fedora you can make use of the Avocado `module <https://avocado-framework.readthedocs.io/en/latest/guides/user/chapters/installing.html#installing-from-packages>`__.
+Using Avocado is not mandatory for the time being and you can skip it, but
+in the future we plan on making the TCK internal coupling with Avocado tighter.
+
+Running TCK
+~~~~~~~~~~~
+
+Once you have all the dependencies installed, you can then proceed with running
+as root the test suite as root (when running with Avocado):
+
+::
+
+    # avocado --config avocado.config run --tap - ./scripts/
+
+from the TCK's git root.
+
+
+If you don't want to install Avocado you can execute tests using the
+``libvirt-tck`` binary directly (again, from the git root). You'll need to pass
+a few options that Avocado takes care of:
+
+::
+
+    # PERL5LIB=./lib perl bin/libvirt-tck -c <path_to_config> --force ./scripts
+
+Running with the ``--force`` argument is not necessary and you can safely omit
+it, but it becomes useful if you need to interrupt a test run for some
+reason. In such case using ``--force`` ensures the first thing TCK does before
+running any tests is that it will clean up all resources from the previous test
+run which may have been left behind if you had interrupted the previous TCK's
+execution.
+
+Note that running with root privileges is necessary since some tests need
+access to system resources or configs. This, along with the fact that some
+tests might affect the host system are good reasons to consider using a test VM
+as described above.
+
+Contributing a test
+-------------------
+
+We'd appreciate if you provided a functional test case whenever you're adding a
+new feature or fixing a bug in libvirt with the only complication being that
+in case you're adding a new public API then a Perl binding will have to be
+introduced first. After that, the best way to start is looking at some existing
+tests, copy-pasting one that fits your scenario the best and tweak the
+remaining bits.
-- 
2.36.1


From eskultet at redhat.com  Thu Jul 14 15:34:28 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Thu, 14 Jul 2022 17:34:28 +0200
Subject: [libvirt PATCH v2 03/10] docs: Provide an article on how to add a
 custom runner to the project
In-Reply-To: <cover.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
Message-ID: <1dc037ec179ea292768a00b39c2ebf132af16250.1657812867.git.eskultet@redhat.com>

Since running our functional test suite in GitLab cannot make use of
the shared resources it makes sense to document the process of adding
own HW to run the custom libvirt executor that powers the integration
suite. This article will likely make even more sense in the future with
GitLab severely cutting down on shared CI resources.

Signed-off-by: Erik Skultety <eskultet at redhat.com>
Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/ci-runners.rst | 86 +++++++++++++++++++++++++++++++++++++++++++++
 docs/meson.build    |  1 +
 2 files changed, 87 insertions(+)
 create mode 100644 docs/ci-runners.rst

diff --git a/docs/ci-runners.rst b/docs/ci-runners.rst
new file mode 100644
index 0000000000..fd5fdd121a
--- /dev/null
+++ b/docs/ci-runners.rst
@@ -0,0 +1,86 @@
+GitLab CI Custom (Specific) Runners
+===================================
+
+.. contents::
+
+GitLab's CI allows additional machines to be added to the project's or group's
+pool of runners (a runner is a machine running the GitLab's
+`gitlab-runner <https://gitlab.com/gitlab-org/gitlab-runner/>`__ agent service).
+Upon registering the runner the runner will then be ready accepting CI jobs
+depending on the pipeline configuration. Unlike the shared runners provided
+directly by GitLab's hosted SaaS specific runners are only used within the
+project/group which they were registered to, so you don't need to worry about
+forks burning CPU cycles on your precious HW resources.
+
+Understandably, we respect your decision to keep your runners only visible to
+your fork, but for the sake of the community we'd appreciate if you decided to
+register your runner with the upstream libvirt project instead. As we're only
+interested in running upstream test workloads (which you can even help
+defining) maintenance and security of the HW is your own responsibility and so
+we can promise to never ask for physical or remote access to the machine.
+
+Machine Setup Howto
+-------------------
+
+The following sections will guide you through the necessary setup of your
+specific GitLab runners.
+
+gitlab-runner setup and registration
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The gitlab-runner agent needs to be installed on each machine that is supposed
+to run jobs. The association between a machine and a GitLab project
+happens with a registration token.  To find the registration token for
+your repository/project, navigate on GitLab's web UI to:
+
+ * Settings (the gears-like icon at the bottom of the left hand side
+   vertical toolbar), then
+ * CI/CD, then
+ * Runners, and click on the *Expand* button, then
+ * Under *Set up a specific Runner manually*, look for the value under
+   *And this registration token:*
+
+Note that in order to register a runner with the upstream libvirt project
+you'll need to work with the project maintainers to successfully register your
+machine.
+
+Following the `registration <https://docs.gitlab.com/runner/register/>`__
+process, it's necessary to configure the runner tags, and optionally other
+configurations on the GitLab UI.  Navigate to:
+
+ * Settings (the gears like icon), then
+ * CI/CD, then
+ * Runners, and click on the *Expand* button, then
+ * *Runners activated for this project*, then
+ * Click on the *Edit* icon (next to the *Lock* Icon)
+
+Don't forget to add a tag to your runner as these are used to route specific
+jobs to specific runners, e.g. if a job in ``ci/integration.yml`` looked like
+this ::
+
+    centos-stream-9-tests:
+    ...
+    variables:
+      # needed by libvirt-gitlab-executor
+      DISTRO: centos-stream-9
+      # can be overridden in forks to set a different runner tag
+      LIBVIRT_CI_INTEGRATION_RUNNER_TAG: my-vm-host
+    tags:
+    - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG
+
+it would mean that the CentOS Stream 9 job would only be scheduled on runners
+bearing the 'my-vm-host' tag.
+
+Running integration tests
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Libvirt's integration tests run in a nested virtualization environment. So, if
+you wish to run integration tests on your bare-metal machine, you'll have to
+make use of GitLab's
+`custom executor <https://docs.gitlab.com/runner/executors/custom.html>`__
+feature which allows you to provision any kind of environment for a workload to
+run - in libvirt's case - a virtual machine. If you need any help with creating
+VM template images ready to run libvirt's integration test suite, have a look
+at the `libvirt-gitlab-executor <https://gitlab.com/libvirt/libvirt-custom-executor>`__
+project which encapsulates provisioning, execution, and teardown of the
+virtualized environments in a single tool.
diff --git a/docs/meson.build b/docs/meson.build
index fd9df047cb..0c7c54a75f 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -35,6 +35,7 @@ docs_rst_files = [
   'cgroups',
   'ci',
   'ci-dashboard',
+  'ci-runners',
   'coding-style',
   'committer-guidelines',
   'compiling',
-- 
2.36.1


From berrange at redhat.com  Thu Jul 14 15:45:40 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 14 Jul 2022 16:45:40 +0100
Subject: [libvirt PATCH v2 04/10] docs: Provide an article on testing
In-Reply-To: <23505d4b886d005972649dea44eb1d162e262c03.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
 <23505d4b886d005972649dea44eb1d162e262c03.1657812867.git.eskultet@redhat.com>
Message-ID: <YtA6JJhEs87la+1J@redhat.com>

On Thu, Jul 14, 2022 at 05:34:29PM +0200, Erik Skultety wrote:
> Currently we don't have much information on how testing is done in
> libvirt and the little we have is scattered among multiple files. This
> patch creates a common landing page containing all important bits about
> testing in libvirt, providing links to respective sections which
> deserve their own articles.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/meson.build |   1 +
>  docs/testing.rst | 172 +++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 173 insertions(+)
>  create mode 100644 docs/testing.rst

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Thu Jul 14 15:46:02 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 14 Jul 2022 16:46:02 +0100
Subject: [libvirt PATCH v2 07/10] docs: Change the CI headline from "CI
 Testing" to "CI"
In-Reply-To: <fbd55a20d2df6856175779111c51ebae88c026cd.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
 <fbd55a20d2df6856175779111c51ebae88c026cd.1657812867.git.eskultet@redhat.com>
Message-ID: <YtA6OvQ1LeEK6IYX@redhat.com>

On Thu, Jul 14, 2022 at 05:34:32PM +0200, Erik Skultety wrote:
> It's not just strategy the master CI article talks (or will talk in the
> future) about.
> 
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/docs.rst | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Thu Jul 14 15:50:59 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 14 Jul 2022 16:50:59 +0100
Subject: [libvirt PATCH v2 08/10] docs: ci: Add info about the two major
 types of jobs our CI runs
In-Reply-To: <c69ebdc766c21f808494f39bc88cb43482ce5f6d.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
 <c69ebdc766c21f808494f39bc88cb43482ce5f6d.1657812867.git.eskultet@redhat.com>
Message-ID: <YtA7Y201RRFHXekj@redhat.com>

On Thu, Jul 14, 2022 at 05:34:33PM +0200, Erik Skultety wrote:
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci.rst | 39 ++++++++++++++++++++-------------------
>  1 file changed, 20 insertions(+), 19 deletions(-)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Thu Jul 14 15:51:24 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 14 Jul 2022 16:51:24 +0100
Subject: [libvirt PATCH v2 09/10] docs: ci: Add a section on how to add a
 new platform to libvirt CI
In-Reply-To: <d3b4ec9d6d776df5187b6160495fcd84dad135f5.1657812867.git.eskultet@redhat.com>
References: <cover.1657812867.git.eskultet@redhat.com>
 <d3b4ec9d6d776df5187b6160495fcd84dad135f5.1657812867.git.eskultet@redhat.com>
Message-ID: <YtA7fLg70gEjn2oC@redhat.com>

On Thu, Jul 14, 2022 at 05:34:34PM +0200, Erik Skultety wrote:
> Signed-off-by: Erik Skultety <eskultet at redhat.com>
> ---
>  docs/ci.rst | 9 +++++++++
>  1 file changed, 9 insertions(+)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From dfaggioli at suse.com  Fri Jul 15 07:48:09 2022
From: dfaggioli at suse.com (Dario Faggioli)
Date: Fri, 15 Jul 2022 09:48:09 +0200
Subject: [PATCH v2 9/9] qemu: Place helper processes into the same
 trusted group
In-Reply-To: <Ys7x43EqFAtbfSkb@redhat.com>
References: <cover.1656324035.git.mprivozn@redhat.com>
 <b8ee5bad51fcbaa04a34ab0c48604131450220b9.1656324035.git.mprivozn@redhat.com>
 <Ys7x43EqFAtbfSkb@redhat.com>
Message-ID: <e210fc2e97ceafcfaed48a902a8b7cca0514c0f5.camel@suse.com>

On Wed, 2022-07-13 at 17:25 +0100, Daniel P. Berrang? wrote:
> It would need to use SCOPE_THREAD_GROUP, except even that is not
> sufficient
> as the helper may have fork+exec'd another helper by this point, and
> our
> call will only affect the first process.
> 
> IOW, to set core scheduling cookies on the helpers, we need to set
> them
> upfront at the time we spawn the helper.
> 
> IOW, during startup, IIUC, we need to fork? a dummy process solely to
> call PR_SCHED_CORE_CREATE. Then when forking anything else, whether a
> helper, or QEMU itself, we need to pull the cookie from that dummy
> process, and then finally kill that dummy process.
> 
Yes. Not pretty, but if forks are involved, that's the solution, I
think.

An alternative would be to create/pull the cookie in the main process
(the one that forks all the helpers), then do fork all helpers, and
then "clear" the cookie for it.

But I guess that would be even worse...

Regards
-- 
Dario Faggioli, Ph.D
http://about.me/dario.faggioli
Virtualization Software Engineer
SUSE Labs, SUSE https://www.suse.com/
-------------------------------------------------------------------
<<This happens because _I_ choose it to happen!>> (Raistlin Majere)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220715/d3768cd6/attachment.sig>

From eskultet at redhat.com  Fri Jul 15 08:58:29 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Fri, 15 Jul 2022 10:58:29 +0200
Subject: [libvirt PATCH] util: remove virObjectUnref() adapters
In-Reply-To: <20220714145225.3959236-1-jjongsma@redhat.com>
References: <20220714145225.3959236-1-jjongsma@redhat.com>
Message-ID: <YtEsNZU7EPe+EUY6@nautilus.home.lan>

On Thu, Jul 14, 2022 at 09:52:25AM -0500, Jonathon Jongsma wrote:
> These wrapper functions were used to adapt the virObjectUnref() function
> signature for different callbacks. But in commit 0d184072, the
> virObjectUnref() function was changed to return a void instead of a
> bool, so these adapters are no longer necessary.
> 
> Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
> ---

This patch fails the build. The following needs to be squashed in:

diff --git a/src/util/virfilecache.c b/src/util/virfilecache.c
index c4bc984020..bad37c9f00 100644
--- a/src/util/virfilecache.c
+++ b/src/util/virfilecache.c
@@ -239,7 +239,7 @@ virFileCacheNew(const char *dir,
     if (!(cache = virObjectNew(virFileCacheClass)))
         return NULL;

-    cache->table = virHashNew(virObjectFreeHashData);
+    cache->table = virHashNew(virObjectUnref);

     cache->dir = g_strdup(dir);

Reviewed-by: Erik Skultety <eskultet at redhat.com>


From eperezma at redhat.com  Fri Jul 15 09:14:58 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Fri, 15 Jul 2022 11:14:58 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
Message-ID: <20220715091458.2620872-1-eperezma@redhat.com>

Currently, the migration code denies migration as long as the VM has a
vhost-vDPA device.

While it's true that vhost-vDPA devices cannot be migrated at the moment, there are plans to be able to migrate them soon.

Libvirt must treat it equal to vhost-kernel devices: Not all of them can
be migrated (the ones that do not expose the feature VHOST_F_LOG_ALL
cannot be migrated). So checks like this one should work for all vhost
devices equally.

A more accurate solution is to ask qemu if it has an active migration
blocker at that moment. Hoever, that require synchronization to avoid
qemu to add one between the query and the actual migration command.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
 src/qemu/qemu_migration.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 9c3fd41761..4ddf027c83 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1546,12 +1546,6 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
             virDomainNetDef *net = vm->def->nets[i];
             qemuSlirp *slirp;
 
-            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
-                virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                               _("vDPA devices cannot be migrated"));
-                return false;
-            }
-
             slirp = QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp;
 
             if (slirp && !qemuSlirpHasFeature(slirp, QEMU_SLIRP_FEATURE_MIGRATE)) {
-- 
2.31.1


From pkrempa at redhat.com  Fri Jul 15 11:44:05 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:05 +0200
Subject: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to
 qemu-4.2 (part 1)
Message-ID: <cover.1657884290.git.pkrempa@redhat.com>

In August Debian 10 officially reaches EOL, thus we can bump minimum
qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.

QEMU-4.2 allows us to remove a big bunch of old code though. Few
examples which this series (and the next iterations of it)  will deal
with:
 - old auidiodev config via ENV variables
 - old-style VIRTIO tranitional setup (possibly)
 - most of legacy block device setup (upcoming series)

This series is lacking the removal of Debian 10 from our CI infra
though, I'll post that separately once I get to it.

The patches can also be fetched at:

 git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1

as some of the pure-removal patches here will be truncated to prevent
spamming the list.

Peter Krempa (20):
  qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
    'x86-kvm-32-on-64'
  tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
    tests
  qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
  qemuxml2argvtest: Remove 'qemu-3.1' versions of
    virtio-(non-)transitional tests
  qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
    test
  qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
    case
  qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
    and 'cpu-tsc-frequency'
  tests: qemucapabilities: Remove qemu-3.1 test data
  tests: domaincaps: Remove test data for qemu-3.1
  qemucapabilitiestest: Remove test data for qemu-4.0
  domaincapstest: Remove test data for qemu-4.0
  qemucapabilitiestest: Remove test data for qemu-4.1
  domaincapstest: Remove test data for qemu-4.1
  qemu: Formally deprecate support for qemu < 4.2
  qemu: command: Always assume QEMU_CAPS_AUDIODEV
  qemu: command: Drop the code for configuring audio devices via
    environment variables
  qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
  qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
  qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
    tests
  qemu: capabilities: Retire QEMU_CAPS_AUDIODEV

 docs/drvqemu.rst                              |     2 +-
 src/qemu/qemu_capabilities.c                  |     7 +-
 src/qemu/qemu_capabilities.h                  |     2 +-
 src/qemu/qemu_command.c                       |   221 +-
 src/qemu/qemu_validate.c                      |    86 -
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   211 -
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   230 -
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   138 -
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   211 -
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   211 -
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   230 -
 .../qemu_4.0.0-virt.aarch64.xml               |   179 -
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   173 -
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   139 -
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   236 -
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   211 -
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   217 -
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   233 -
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   217 -
 .../caps_3.1.0.ppc64.replies                  | 23732 ---------------
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
 .../caps_3.1.0.x86_64.replies                 | 24428 ---------------
 .../caps_3.1.0.x86_64.xml                     |  1387 -
 .../caps_4.0.0.aarch64.replies                | 20893 -------------
 .../caps_4.0.0.aarch64.xml                    |   363 -
 .../caps_4.0.0.ppc64.replies                  | 24461 ---------------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
 .../caps_4.0.0.riscv32.replies                | 18154 -----------
 .../caps_4.0.0.riscv32.xml                    |   157 -
 .../caps_4.0.0.riscv64.replies                | 18154 -----------
 .../caps_4.0.0.riscv64.xml                    |   157 -
 .../caps_4.0.0.s390x.replies                  | 21721 -------------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
 .../caps_4.0.0.x86_64.replies                 | 25001 ---------------
 .../caps_4.0.0.x86_64.xml                     |  1398 -
 .../caps_4.1.0.x86_64.replies                 | 25198 ----------------
 .../caps_4.1.0.x86_64.xml                     |  1971 --
 .../caps_4.2.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     1 -
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     1 -
 .../caps_4.2.0.x86_64.xml                     |     1 -
 .../caps_5.0.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     1 -
 .../caps_5.0.0.riscv64.xml                    |     1 -
 .../caps_5.0.0.x86_64.xml                     |     1 -
 .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     1 -
 .../caps_5.1.0.x86_64.xml                     |     1 -
 .../caps_5.2.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     1 -
 .../caps_5.2.0.riscv64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     1 -
 .../caps_5.2.0.x86_64.xml                     |     1 -
 .../caps_6.0.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |     1 -
 .../caps_6.0.0.x86_64.xml                     |     1 -
 .../caps_6.1.0.x86_64.xml                     |     1 -
 .../caps_6.2.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |     1 -
 .../caps_6.2.0.x86_64.xml                     |     1 -
 .../caps_7.0.0.aarch64.xml                    |     1 -
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |     1 -
 .../caps_7.0.0.x86_64.xml                     |     1 -
 .../caps_7.1.0.x86_64.xml                     |     1 -
 .../aarch64-aavmf-virtio-mmio.args            |     2 +-
 .../aarch64-cpu-passthrough.args              |     2 +-
 .../aarch64-features-sve.aarch64-4.0.0.err    |     1 -
 tests/qemuxml2argvdata/aarch64-gic-host.args  |     2 +-
 .../aarch64-gic-none-tcg.args                 |     2 +-
 tests/qemuxml2argvdata/aarch64-gic-v2.args    |     2 +-
 tests/qemuxml2argvdata/aarch64-gic-v3.args    |     2 +-
 .../aarch64-kvm-32-on-64.args                 |     2 +-
 .../qemuxml2argvdata/aarch64-pci-serial.args  |     2 +-
 .../aarch64-traditional-pci.args              |     2 +-
 .../aarch64-usb-controller-nec-xhci.args      |     2 +-
 .../aarch64-usb-controller-qemu-xhci.args     |     2 +-
 .../aarch64-video-default.args                |     4 +-
 .../aarch64-video-virtio-gpu-pci.args         |     2 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |     2 +-
 .../aarch64-virt-default-nic.args             |     2 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |     2 +-
 .../aarch64-virtio-pci-default.args           |     2 +-
 .../aarch64-virtio-pci-manual-addresses.args  |     2 +-
 tests/qemuxml2argvdata/acpi-table.args        |     2 +-
 .../arm-vexpressa9-basic.args                 |     2 +-
 .../arm-vexpressa9-nodevs.args                |     2 +-
 .../arm-vexpressa9-virtio.args                |     2 +-
 tests/qemuxml2argvdata/arm-virt-virtio.args   |     2 +-
 .../audio-alsa-best.x86_64-4.1.0.args         |    46 -
 .../audio-alsa-full.x86_64-4.1.0.err          |     1 -
 .../audio-alsa-minimal.x86_64-4.1.0.args      |    33 -
 .../audio-coreaudio-best.x86_64-4.1.0.args    |    46 -
 .../audio-coreaudio-full.x86_64-4.1.0.err     |     1 -
 .../audio-coreaudio-minimal.x86_64-4.1.0.args |    33 -
 ...audio-default-nographics.x86_64-4.1.0.args |    33 -
 tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
 .../qemuxml2argvdata/audio-default-spice.args |     2 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |     4 +-
 .../audio-file-best.x86_64-4.1.0.args         |    45 -
 .../audio-file-full.x86_64-4.1.0.err          |     1 -
 .../audio-file-minimal.x86_64-4.1.0.args      |    33 -
 .../audio-jack-full.x86_64-4.1.0.err          |     1 -
 .../audio-jack-minimal.x86_64-4.1.0.err       |     1 -
 .../audio-many-backends.x86_64-4.1.0.err      |     1 -
 .../audio-none-best.x86_64-4.1.0.args         |    44 -
 .../audio-none-full.x86_64-4.1.0.err          |     1 -
 .../audio-none-minimal.x86_64-4.1.0.args      |    33 -
 .../audio-oss-best.x86_64-4.1.0.args          |    49 -
 .../audio-oss-full.x86_64-4.1.0.err           |     1 -
 .../audio-oss-minimal.x86_64-4.1.0.args       |    33 -
 .../audio-pulseaudio-best.x86_64-4.1.0.args   |    48 -
 .../audio-pulseaudio-full.x86_64-4.1.0.err    |     1 -
 ...audio-pulseaudio-minimal.x86_64-4.1.0.args |    33 -
 .../audio-sdl-best.x86_64-4.1.0.args          |    46 -
 .../audio-sdl-full.x86_64-4.1.0.err           |     1 -
 .../audio-sdl-minimal.x86_64-4.1.0.args       |    33 -
 .../audio-spice-best.x86_64-4.1.0.args        |    45 -
 .../audio-spice-full.x86_64-4.1.0.err         |     1 -
 .../audio-spice-minimal.x86_64-4.1.0.args     |    34 -
 tests/qemuxml2argvdata/autoindex.args         |     2 +-
 .../qemuxml2argvdata/balloon-ccw-deflate.args |     2 +-
 .../qemuxml2argvdata/balloon-device-auto.args |     2 +-
 .../balloon-device-deflate-off.args           |     2 +-
 .../balloon-device-deflate.args               |     2 +-
 .../balloon-device-period.args                |     2 +-
 tests/qemuxml2argvdata/balloon-device.args    |     2 +-
 .../balloon-mmio-deflate.args                 |     2 +-
 .../blkdeviotune-group-num.x86_64-4.1.0.args  |    37 -
 .../blkdeviotune-max-length.x86_64-4.1.0.args |    37 -
 .../blkdeviotune-max.x86_64-4.1.0.args        |    37 -
 tests/qemuxml2argvdata/blkiotune-device.args  |     2 +-
 tests/qemuxml2argvdata/blkiotune.args         |     2 +-
 tests/qemuxml2argvdata/boot-cdrom.args        |     2 +-
 tests/qemuxml2argvdata/boot-complex.args      |     2 +-
 tests/qemuxml2argvdata/boot-floppy-q35.args   |     2 +-
 tests/qemuxml2argvdata/boot-floppy.args       |     2 +-
 .../boot-menu-disable-drive.args              |     2 +-
 tests/qemuxml2argvdata/boot-menu-disable.args |     2 +-
 .../boot-menu-enable-with-timeout.args        |     2 +-
 tests/qemuxml2argvdata/boot-menu-enable.args  |     2 +-
 tests/qemuxml2argvdata/boot-multi.args        |     2 +-
 tests/qemuxml2argvdata/boot-network.args      |     2 +-
 tests/qemuxml2argvdata/boot-order.args        |     2 +-
 tests/qemuxml2argvdata/channel-guestfwd.args  |     2 +-
 tests/qemuxml2argvdata/channel-spicevmc.args  |     2 +-
 .../qemuxml2argvdata/channel-virtio-auto.args |     2 +-
 .../channel-virtio-autoadd.args               |     2 +-
 .../channel-virtio-autoassign.args            |     2 +-
 .../channel-virtio-default.args               |     2 +-
 .../channel-virtio-state.args                 |     2 +-
 .../qemuxml2argvdata/channel-virtio-unix.args |     2 +-
 tests/qemuxml2argvdata/channel-virtio.args    |     2 +-
 tests/qemuxml2argvdata/chardev-reconnect.args |     2 +-
 tests/qemuxml2argvdata/clock-catchup.args     |     2 +-
 tests/qemuxml2argvdata/clock-france.args      |     2 +-
 tests/qemuxml2argvdata/clock-hpet-off.args    |     2 +-
 .../clock-localtime-basis-localtime.args      |     2 +-
 tests/qemuxml2argvdata/clock-localtime.args   |     2 +-
 tests/qemuxml2argvdata/clock-realtime.args    |     2 +-
 .../clock-timer-hyperv-rtc.args               |     2 +-
 tests/qemuxml2argvdata/clock-utc.args         |     2 +-
 tests/qemuxml2argvdata/clock-variable.args    |     2 +-
 .../qemuxml2argvdata/console-compat-auto.args |     2 +-
 .../console-compat-chardev.args               |     2 +-
 tests/qemuxml2argvdata/console-compat.args    |     2 +-
 .../qemuxml2argvdata/console-virtio-ccw.args  |     2 +-
 .../qemuxml2argvdata/console-virtio-many.args |     2 +-
 tests/qemuxml2argvdata/console-virtio.args    |     2 +-
 tests/qemuxml2argvdata/controller-order.args  |     4 +-
 tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell.args       |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell2.args      |     2 +-
 tests/qemuxml2argvdata/cpu-Haswell3.args      |     2 +-
 tests/qemuxml2argvdata/cpu-cache-disable.args |     2 +-
 .../qemuxml2argvdata/cpu-cache-disable2.args  |     2 +-
 .../qemuxml2argvdata/cpu-cache-disable3.args  |     2 +-
 .../cpu-cache-emulate-l3.args                 |     2 +-
 .../cpu-cache-passthrough.args                |     2 +-
 .../cpu-cache-passthrough2.args               |     2 +-
 .../cpu-check-default-none.args               |     2 +-
 .../cpu-check-default-none2.args              |     2 +-
 .../cpu-check-default-partial.args            |     2 +-
 .../cpu-check-default-partial2.args           |     2 +-
 tests/qemuxml2argvdata/cpu-check-none.args    |     2 +-
 tests/qemuxml2argvdata/cpu-exact1.args        |     2 +-
 .../cpu-exact2-nofallback.args                |     2 +-
 tests/qemuxml2argvdata/cpu-exact2.args        |     2 +-
 tests/qemuxml2argvdata/cpu-fallback.args      |     2 +-
 tests/qemuxml2argvdata/cpu-host-kvmclock.args |     2 +-
 .../qemuxml2argvdata/cpu-host-model-cmt.args  |     2 +-
 .../cpu-host-model-cmt.x86_64-4.0.0.args      |    33 -
 .../cpu-host-model-fallback.args              |     2 +-
 .../cpu-host-model-vendor.args                |     2 +-
 tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
 .../cpu-host-model.x86_64-3.1.0.args          |    36 -
 .../cpu-host-model.x86_64-4.0.0.args          |    36 -
 .../cpu-host-model.x86_64-4.1.0.args          |    36 -
 .../cpu-host-passthrough-features.args        |     2 +-
 .../cpu-host-passthrough.args                 |     2 +-
 .../qemuxml2argvdata/cpu-hotplug-startup.args |     2 +-
 tests/qemuxml2argvdata/cpu-kvmclock.args      |     2 +-
 tests/qemuxml2argvdata/cpu-minimum1.args      |     2 +-
 tests/qemuxml2argvdata/cpu-minimum2.args      |     2 +-
 .../cpu-no-removed-features.args              |     2 +-
 tests/qemuxml2argvdata/cpu-numa-disjoint.args |     2 +-
 .../qemuxml2argvdata/cpu-numa-memshared.args  |     2 +-
 .../cpu-numa-no-memory-element.args           |     2 +-
 tests/qemuxml2argvdata/cpu-numa1.args         |     2 +-
 tests/qemuxml2argvdata/cpu-numa2.args         |     2 +-
 tests/qemuxml2argvdata/cpu-s390-features.args |     2 +-
 tests/qemuxml2argvdata/cpu-s390-zEC12.args    |     2 +-
 tests/qemuxml2argvdata/cpu-strict1.args       |     2 +-
 tests/qemuxml2argvdata/cpu-topology1.args     |     2 +-
 tests/qemuxml2argvdata/cpu-topology2.args     |     2 +-
 tests/qemuxml2argvdata/cpu-topology3.args     |     2 +-
 tests/qemuxml2argvdata/cpu-tsc-frequency.args |     2 +-
 .../cpu-tsc-frequency.x86_64-4.0.0.args       |    33 -
 tests/qemuxml2argvdata/cputune-numatune.args  |     2 +-
 .../qemuxml2argvdata/cputune-zero-shares.args |     2 +-
 tests/qemuxml2argvdata/cputune.args           |     2 +-
 .../default-kvm-host-arch.args                |     2 +-
 .../default-qemu-host-arch.args               |     2 +-
 .../disk-aio.x86_64-4.1.0.args                |    36 -
 .../disk-arm-virtio-sd.aarch64-4.0.0.args     |    38 -
 ...isk-backing-chains-index.x86_64-4.1.0.args |    45 -
 ...k-backing-chains-noindex.x86_64-4.1.0.args |     1 -
 .../disk-cache.x86_64-3.1.0.args              |    42 -
 .../disk-cache.x86_64-4.1.0.args              |    42 -
 .../disk-cdrom-network.x86_64-4.1.0.args      |    39 -
 .../disk-cdrom-tray.x86_64-4.1.0.args         |    38 -
 .../disk-cdrom.x86_64-4.1.0.args              |    39 -
 .../disk-copy_on_read.x86_64-4.1.0.args       |    39 -
 .../disk-detect-zeroes.x86_64-4.1.0.args      |    37 -
 .../disk-discard.x86_64-4.1.0.args            |    36 -
 .../disk-error-policy-s390x.s390x-4.0.0.args  |    35 -
 .../disk-error-policy.x86_64-4.1.0.args       |    37 -
 .../disk-floppy-q35.x86_64-4.1.0.args         |    36 -
 .../disk-floppy.x86_64-4.1.0.args             |    37 -
 .../disk-fmt-qcow.x86_64-4.1.0.args           |    35 -
 .../disk-network-gluster.x86_64-4.1.0.args    |    37 -
 .../disk-network-iscsi.x86_64-4.1.0.args      |    49 -
 .../disk-network-nbd.x86_64-4.1.0.args        |    41 -
 ...disk-network-rbd-no-colon.x86_64-4.1.0.err |     1 -
 .../disk-network-rbd.x86_64-4.1.0.args        |    44 -
 .../disk-network-sheepdog.x86_64-4.1.0.args   |    35 -
 ...disk-network-source-auth.x86_64-4.1.0.args |    40 -
 ...disk-network-tlsx509-nbd.x86_64-4.1.0.args |    35 -
 ...isk-network-tlsx509-vxhs.x86_64-4.1.0.args |    41 -
 .../disk-readonly-disk.x86_64-4.1.0.args      |    36 -
 .../disk-shared.x86_64-3.1.0.args             |    41 -
 .../disk-shared.x86_64-4.1.0.args             |    41 -
 .../disk-source-pool-mode.x86_64-4.1.0.args   |    40 -
 .../disk-source-pool.x86_64-4.1.0.args        |    42 -
 .../disk-transient.x86_64-4.1.0.err           |     1 -
 ...virtio-scsi-reservations.x86_64-4.1.0.args |    39 -
 .../encrypted-disk-usage.x86_64-4.1.0.args    |    35 -
 .../encrypted-disk.x86_64-4.1.0.args          |    35 -
 .../fd-memory-no-numa-topology.args           |     2 +-
 .../fd-memory-numa-topology.args              |     2 +-
 .../fd-memory-numa-topology2.args             |     2 +-
 .../fd-memory-numa-topology3.args             |     2 +-
 .../firmware-manual-bios.args                 |     2 +-
 .../firmware-manual-efi-acpi-aarch64.args     |     2 +-
 .../firmware-manual-efi-acpi-q35.args         |     2 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |     2 +-
 ...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |     1 -
 .../firmware-manual-efi-secure.args           |     2 +-
 .../qemuxml2argvdata/firmware-manual-efi.args |     2 +-
 .../firmware-manual-noefi-acpi-q35.args       |     2 +-
 .../firmware-manual-noefi-noacpi-aarch64.args |     2 +-
 .../firmware-manual-noefi-noacpi-q35.args     |     2 +-
 .../floppy-drive-fat.x86_64-4.1.0.args        |    35 -
 .../hostdev-mdev-precreated.args              |     2 +-
 .../hostdev-pci-address-unassigned.args       |     2 +-
 .../hostdev-pci-multifunction.args            |     2 +-
 .../hostdev-scsi-lsi.x86_64-4.1.0.args        |    49 -
 .../hostdev-scsi-vhost-scsi-ccw.args          |     2 +-
 .../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
 .../hostdev-scsi-vhost-scsi-pcie.args         |     2 +-
 ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args |    51 -
 .../hostdev-subsys-mdev-vfio-ccw.args         |     2 +-
 .../hostdev-vfio-multidomain.args             |     2 +-
 .../hostdev-vfio-zpci-autogenerate-fids.args  |     2 +-
 .../hostdev-vfio-zpci-autogenerate-uids.args  |     2 +-
 .../hostdev-vfio-zpci-autogenerate.args       |     2 +-
 .../hostdev-vfio-zpci-boundaries.args         |     2 +-
 .../hostdev-vfio-zpci-ccw-memballoon.args     |     2 +-
 .../hostdev-vfio-zpci-multidomain-many.args   |     2 +-
 tests/qemuxml2argvdata/hostdev-vfio-zpci.args |     2 +-
 tests/qemuxml2argvdata/hostdev-vfio.args      |     2 +-
 tests/qemuxml2argvdata/hotplug-base.args      |     2 +-
 .../hugepages-default-2M.args                 |     2 +-
 .../hugepages-default-system-size.args        |     2 +-
 tests/qemuxml2argvdata/hugepages-default.args |     2 +-
 .../qemuxml2argvdata/hugepages-memaccess.args |     2 +-
 .../hugepages-memaccess2.args                 |     2 +-
 tests/qemuxml2argvdata/hugepages-nodeset.args |     2 +-
 .../hugepages-numa-default-2M.args            |     2 +-
 .../hugepages-numa-default-dimm.args          |     2 +-
 .../hugepages-numa-default.args               |     2 +-
 .../hugepages-numa-nodeset-part.args          |     2 +-
 .../hugepages-numa-nodeset.args               |     2 +-
 tests/qemuxml2argvdata/hugepages-shared.args  |     2 +-
 .../hvf-aarch64-virt-headless.args            |     2 +-
 .../hvf-x86_64-q35-headless.args              |     2 +-
 .../qemuxml2argvdata/input-usbmouse-addr.args |     2 +-
 tests/qemuxml2argvdata/input-usbmouse.args    |     2 +-
 tests/qemuxml2argvdata/input-usbtablet.args   |     2 +-
 tests/qemuxml2argvdata/input-virtio-ccw.args  |     2 +-
 .../iothreads-disk-virtio-ccw.args            |     2 +-
 tests/qemuxml2argvdata/iothreads-disk.args    |     2 +-
 .../iothreads-ids-partial.args                |     2 +-
 tests/qemuxml2argvdata/iothreads-ids.args     |     2 +-
 tests/qemuxml2argvdata/iothreads.args         |     2 +-
 tests/qemuxml2argvdata/kvm-features-off.args  |     2 +-
 tests/qemuxml2argvdata/kvm-features.args      |     2 +-
 tests/qemuxml2argvdata/kvm-pit-delay.args     |     2 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args   |     2 +-
 tests/qemuxml2argvdata/kvmclock.args          |     2 +-
 .../luks-disks-source.x86_64-4.1.0.args       |    48 -
 .../luks-disks.x86_64-4.1.0.args              |    39 -
 .../mach-virt-console-virtio.args             |     2 +-
 .../mach-virt-serial-native.args              |     2 +-
 .../mach-virt-serial-pci.args                 |     2 +-
 .../mach-virt-serial-usb.args                 |     2 +-
 .../machine-aeskeywrap-off-cap.args           |     2 +-
 .../machine-aeskeywrap-off-caps.args          |     2 +-
 .../machine-aeskeywrap-on-cap.args            |     2 +-
 .../machine-aeskeywrap-on-caps.args           |     2 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |     2 +-
 tests/qemuxml2argvdata/machine-aliases2.args  |     2 +-
 tests/qemuxml2argvdata/machine-core-off.args  |     2 +-
 tests/qemuxml2argvdata/machine-core-on.args   |     2 +-
 .../machine-deakeywrap-off-cap.args           |     2 +-
 .../machine-deakeywrap-off-caps.args          |     2 +-
 .../machine-deakeywrap-on-cap.args            |     2 +-
 .../machine-deakeywrap-on-caps.args           |     2 +-
 .../machine-keywrap-none-caps.args            |     2 +-
 .../machine-keywrap-none.args                 |     2 +-
 ...ine-loadparm-multiple-disks-nets-s390.args |     2 +-
 .../machine-loadparm-net-s390.args            |     2 +-
 .../machine-loadparm-s390.args                |     2 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |     2 +-
 tests/qemuxml2argvdata/master-key.args        |     2 +-
 .../memory-hotplug-dimm-addr.args             |     2 +-
 .../qemuxml2argvdata/memory-hotplug-dimm.args |     2 +-
 ...emory-hotplug-nvdimm-ppc64-abi-update.args |     2 +-
 .../memory-hotplug-nvdimm-ppc64.args          |     2 +-
 ...emory-hotplug-ppc64-nonuma-abi-update.args |     2 +-
 .../memory-hotplug-ppc64-nonuma.args          |     2 +-
 tests/qemuxml2argvdata/memory-hotplug.args    |     2 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |     2 +-
 tests/qemuxml2argvdata/memtune.args           |     2 +-
 .../migrate-numa-unaligned.args               |     2 +-
 tests/qemuxml2argvdata/migrate.args           |     2 +-
 tests/qemuxml2argvdata/minimal.args           |     2 +-
 tests/qemuxml2argvdata/misc-acpi.args         |     2 +-
 tests/qemuxml2argvdata/misc-disable-s3.args   |     2 +-
 .../misc-disable-suspends.args                |     2 +-
 tests/qemuxml2argvdata/misc-enable-s4.args    |     2 +-
 tests/qemuxml2argvdata/misc-uuid.args         |     2 +-
 tests/qemuxml2argvdata/monitor-json.args      |     2 +-
 .../multifunction-pci-device.args             |     2 +-
 tests/qemuxml2argvdata/net-client.args        |     2 +-
 tests/qemuxml2argvdata/net-eth-hostip.args    |     2 +-
 tests/qemuxml2argvdata/net-eth-ifname.args    |     2 +-
 tests/qemuxml2argvdata/net-eth-names.args     |     2 +-
 .../net-eth-unmanaged-tap.args                |     2 +-
 tests/qemuxml2argvdata/net-eth.args           |     2 +-
 .../net-hostdev-bootorder.args                |     2 +-
 .../net-hostdev-multidomain.args              |     2 +-
 .../net-hostdev-vfio-multidomain.args         |     2 +-
 tests/qemuxml2argvdata/net-hostdev-vfio.args  |     2 +-
 tests/qemuxml2argvdata/net-hostdev.args       |     2 +-
 tests/qemuxml2argvdata/net-many-models.args   |     2 +-
 tests/qemuxml2argvdata/net-mcast.args         |     2 +-
 tests/qemuxml2argvdata/net-server.args        |     2 +-
 tests/qemuxml2argvdata/net-udp.args           |     2 +-
 tests/qemuxml2argvdata/net-user-addr.args     |     2 +-
 tests/qemuxml2argvdata/net-user.args          |     2 +-
 .../net-vhostuser-multiq.args                 |     2 +-
 tests/qemuxml2argvdata/net-vhostuser.args     |     2 +-
 tests/qemuxml2argvdata/net-virtio-ccw.args    |     2 +-
 tests/qemuxml2argvdata/net-virtio-device.args |     2 +-
 .../net-virtio-disable-offloads.args          |     2 +-
 tests/qemuxml2argvdata/net-virtio-netdev.args |     2 +-
 .../net-virtio-rxtxqueuesize.args             |     2 +-
 .../net-virtio-teaming-hostdev.args           |     2 +-
 .../qemuxml2argvdata/net-virtio-teaming.args  |     2 +-
 tests/qemuxml2argvdata/net-virtio.args        |     2 +-
 tests/qemuxml2argvdata/nosharepages.args      |     2 +-
 .../numad-auto-memory-vcpu-cpuset.args        |     2 +-
 ...o-memory-vcpu-no-cpuset-and-placement.args |     2 +-
 .../numad-auto-vcpu-static-numatune.args      |     2 +-
 .../numad-static-memory-auto-vcpu.args        |     2 +-
 tests/qemuxml2argvdata/numad.args             |     2 +-
 .../numatune-auto-nodeset-invalid.args        |     2 +-
 .../numatune-auto-prefer.args                 |     2 +-
 .../qemuxml2argvdata/numatune-distances.args  |     2 +-
 .../numatune-memnode-no-memory.args           |     2 +-
 tests/qemuxml2argvdata/numatune-memnode.args  |     2 +-
 tests/qemuxml2argvdata/numatune-memory.args   |     2 +-
 tests/qemuxml2argvdata/numatune-no-vcpu.args  |     2 +-
 .../qemuxml2argvdata/pages-dimm-discard.args  |     2 +-
 .../pages-discard-hugepages.args              |     2 +-
 tests/qemuxml2argvdata/pages-discard.args     |     2 +-
 .../parallel-parport-chardev.args             |     2 +-
 .../parallel-tcp-chardev.args                 |     2 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |     2 +-
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |     2 +-
 tests/qemuxml2argvdata/pci-autofill-addr.args |     2 +-
 .../pci-bridge-many-disks.args                |     2 +-
 tests/qemuxml2argvdata/pci-bridge.args        |     4 +-
 tests/qemuxml2argvdata/pci-expander-bus.args  |     2 +-
 tests/qemuxml2argvdata/pci-many.args          |     2 +-
 tests/qemuxml2argvdata/pci-rom-disabled.args  |     2 +-
 tests/qemuxml2argvdata/pci-rom.args           |     2 +-
 .../pci-serial-dev-chardev.args               |     2 +-
 tests/qemuxml2argvdata/pcie-expander-bus.args |     2 +-
 .../pcie-root-port-model-generic.args         |     2 +-
 .../pcie-root-port-model-ioh3420.args         |     2 +-
 tests/qemuxml2argvdata/pcie-root-port.args    |     2 +-
 tests/qemuxml2argvdata/pcie-root.args         |     2 +-
 .../pcie-switch-downstream-port.args          |     2 +-
 .../pcie-switch-upstream-port.args            |     2 +-
 tests/qemuxml2argvdata/pcihole64-q35.args     |     2 +-
 tests/qemuxml2argvdata/pcihole64.args         |     2 +-
 tests/qemuxml2argvdata/pmu-feature-off.args   |     2 +-
 tests/qemuxml2argvdata/pmu-feature.args       |     2 +-
 tests/qemuxml2argvdata/ppc-dtb.args           |     2 +-
 .../ppc64-usb-controller-legacy.args          |     2 +-
 .../ppc64-usb-controller-qemu-xhci.args       |     2 +-
 .../ppc64-usb-controller.args                 |     2 +-
 tests/qemuxml2argvdata/ppce500-serial.args    |     2 +-
 tests/qemuxml2argvdata/pseries-basic.args     |     2 +-
 .../pseries-console-virtio.args               |     2 +-
 .../qemuxml2argvdata/pseries-cpu-compat.args  |     2 +-
 tests/qemuxml2argvdata/pseries-cpu-exact.args |     2 +-
 tests/qemuxml2argvdata/pseries-cpu-le.args    |     2 +-
 tests/qemuxml2argvdata/pseries-features.args  |     2 +-
 .../qemuxml2argvdata/pseries-hostdevs-1.args  |     2 +-
 .../qemuxml2argvdata/pseries-hostdevs-2.args  |     2 +-
 .../qemuxml2argvdata/pseries-hostdevs-3.args  |     2 +-
 .../pseries-many-buses-1.args                 |     2 +-
 .../pseries-many-buses-2.args                 |     2 +-
 .../pseries-many-devices.args                 |     2 +-
 tests/qemuxml2argvdata/pseries-nvram.args     |     2 +-
 .../pseries-panic-missing.args                |     2 +-
 .../pseries-panic-no-address.args             |     2 +-
 .../pseries-phb-default-missing.args          |     2 +-
 .../pseries-phb-numa-node.args                |     2 +-
 .../qemuxml2argvdata/pseries-phb-simple.args  |     2 +-
 .../pseries-serial-native.args                |     2 +-
 .../qemuxml2argvdata/pseries-serial-pci.args  |     2 +-
 .../qemuxml2argvdata/pseries-serial-usb.args  |     2 +-
 .../qemuxml2argvdata/pseries-usb-default.args |     2 +-
 tests/qemuxml2argvdata/pseries-usb-kbd.args   |     2 +-
 tests/qemuxml2argvdata/pseries-usb-multi.args |     2 +-
 .../pseries-vio-user-assigned.args            |     2 +-
 tests/qemuxml2argvdata/pseries-vio.args       |     2 +-
 .../q35-default-devices-only.args             |     2 +-
 tests/qemuxml2argvdata/q35-multifunction.args |     2 +-
 .../q35-pci-force-address.args                |     4 +-
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |     2 +-
 tests/qemuxml2argvdata/q35-pcie.args          |     2 +-
 .../q35-pm-disable-fallback.args              |     2 +-
 tests/qemuxml2argvdata/q35-pm-disable.args    |     2 +-
 tests/qemuxml2argvdata/q35-usb2-multi.args    |     2 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |     2 +-
 tests/qemuxml2argvdata/q35-usb2.args          |     2 +-
 .../q35-virt-manager-basic.args               |     4 +-
 tests/qemuxml2argvdata/q35-virtio-pci.args    |     2 +-
 tests/qemuxml2argvdata/q35.args               |     2 +-
 tests/qemuxml2argvdata/qemu-ns-alt.args       |     2 +-
 .../qemu-ns-commandline-ns0.args              |     2 +-
 .../qemu-ns-commandline-ns1.args              |     2 +-
 .../qemuxml2argvdata/qemu-ns-commandline.args |     2 +-
 .../qemu-ns-domain-commandline-ns0.args       |     2 +-
 .../qemu-ns-domain-commandline.args           |     2 +-
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |     2 +-
 tests/qemuxml2argvdata/qemu-ns-no-env.args    |     2 +-
 .../reboot-timeout-disabled.args              |     2 +-
 .../reboot-timeout-enabled.args               |     2 +-
 tests/qemuxml2argvdata/restore-v2-fd.args     |     2 +-
 tests/qemuxml2argvdata/restore-v2.args        |     2 +-
 tests/qemuxml2argvdata/riscv64-virt-pci.args  |     2 +-
 tests/qemuxml2argvdata/riscv64-virt.args      |     2 +-
 .../qemuxml2argvdata/s390-panic-missing.args  |     2 +-
 .../s390-panic-no-address.args                |     2 +-
 tests/qemuxml2argvdata/s390-serial-2.args     |     2 +-
 .../qemuxml2argvdata/s390-serial-console.args |     2 +-
 tests/qemuxml2argvdata/s390-serial.args       |     2 +-
 tests/qemuxml2argvdata/seclabel-dac-none.args |     2 +-
 .../seclabel-dynamic-baselabel.args           |     2 +-
 .../seclabel-dynamic-labelskip.args           |     2 +-
 .../seclabel-dynamic-override.args            |     2 +-
 .../seclabel-dynamic-relabel.args             |     2 +-
 tests/qemuxml2argvdata/seclabel-dynamic.args  |     2 +-
 tests/qemuxml2argvdata/seclabel-none.args     |     2 +-
 .../seclabel-static-labelskip.args            |     2 +-
 .../seclabel-static-relabel.args              |     2 +-
 tests/qemuxml2argvdata/seclabel-static.args   |     2 +-
 .../serial-dev-chardev-iobase.args            |     2 +-
 .../qemuxml2argvdata/serial-dev-chardev.args  |     2 +-
 .../qemuxml2argvdata/serial-file-chardev.args |     2 +-
 tests/qemuxml2argvdata/serial-file-log.args   |     2 +-
 .../qemuxml2argvdata/serial-many-chardev.args |     2 +-
 .../qemuxml2argvdata/serial-pty-chardev.args  |     2 +-
 tests/qemuxml2argvdata/serial-spiceport.args  |     2 +-
 .../qemuxml2argvdata/serial-tcp-chardev.args  |     2 +-
 .../serial-tcp-telnet-chardev.args            |     2 +-
 .../serial-tcp-tlsx509-chardev-notls.args     |     2 +-
 .../serial-tcp-tlsx509-chardev-verify.args    |     2 +-
 .../serial-tcp-tlsx509-chardev.args           |     2 +-
 .../serial-tcp-tlsx509-secret-chardev.args    |     2 +-
 .../qemuxml2argvdata/serial-udp-chardev.args  |     2 +-
 .../qemuxml2argvdata/serial-unix-chardev.args |     2 +-
 tests/qemuxml2argvdata/serial-vc-chardev.args |     2 +-
 .../shmem-plain-doorbell.args                 |     2 +-
 tests/qemuxml2argvdata/shmem.args             |     2 +-
 .../smartcard-controller.args                 |     2 +-
 .../smartcard-host-certificates-database.args |     2 +-
 .../smartcard-host-certificates.args          |     2 +-
 tests/qemuxml2argvdata/smartcard-host.args    |     2 +-
 .../smartcard-passthrough-spicevmc.args       |     2 +-
 .../smartcard-passthrough-tcp.args            |     2 +-
 tests/qemuxml2argvdata/smbios-type-fwcfg.args |     2 +-
 tests/qemuxml2argvdata/smbios.args            |     2 +-
 tests/qemuxml2argvdata/smp-dies.args          |     2 +-
 tests/qemuxml2argvdata/smp.args               |     2 +-
 tests/qemuxml2argvdata/sound-device.args      |    26 +-
 tests/qemuxml2argvdata/sound.args             |     8 +-
 tests/qemuxml2argvdata/sparc-minimal.args     |     2 +-
 .../usb-controller-default-q35.args           |     2 +-
 .../usb-controller-explicit-q35.args          |     2 +-
 .../usb-controller-qemu-xhci.args             |     2 +-
 .../qemuxml2argvdata/usb-controller-xhci.args |     2 +-
 tests/qemuxml2argvdata/usb-controller.args    |     2 +-
 .../usb-hub-autoadd-deluxe.args               |     2 +-
 tests/qemuxml2argvdata/usb-hub-autoadd.args   |     2 +-
 tests/qemuxml2argvdata/usb-hub.args           |     2 +-
 .../qemuxml2argvdata/usb-ich9-autoassign.args |     2 +-
 .../qemuxml2argvdata/usb-ich9-companion.args  |     2 +-
 .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |     2 +-
 .../qemuxml2argvdata/usb-long-port-path.args  |     2 +-
 tests/qemuxml2argvdata/usb-none.args          |     2 +-
 .../usb-piix3-controller.args                 |     2 +-
 .../qemuxml2argvdata/usb-port-autoassign.args |     2 +-
 tests/qemuxml2argvdata/usb-port-missing.args  |     2 +-
 tests/qemuxml2argvdata/usb-ports.args         |     2 +-
 tests/qemuxml2argvdata/usb-redir-boot.args    |     2 +-
 .../usb-redir-filter-version.args             |     2 +-
 tests/qemuxml2argvdata/usb-redir-filter.args  |     2 +-
 tests/qemuxml2argvdata/usb-redir.args         |     2 +-
 .../qemuxml2argvdata/usb-xhci-autoassign.args |     2 +-
 tests/qemuxml2argvdata/usb1-usb2.args         |     2 +-
 tests/qemuxml2argvdata/user-aliases-usb.args  |     2 +-
 tests/qemuxml2argvdata/user-aliases.args      |     6 +-
 .../vcpu-placement-static.args                |     2 +-
 .../video-device-pciaddr-default.args         |     4 +-
 tests/qemuxml2argvdata/video-none-device.args |     4 +-
 .../video-qxl-device-vgamem.args              |     2 +-
 tests/qemuxml2argvdata/video-qxl-device.args  |     2 +-
 tests/qemuxml2argvdata/video-qxl-heads.args   |     2 +-
 tests/qemuxml2argvdata/video-qxl-noheads.args |     2 +-
 .../video-qxl-resolution.args                 |     2 +-
 .../video-qxl-sec-device-vgamem.args          |     2 +-
 .../video-qxl-sec-device.args                 |     2 +-
 .../video-vga-device-vgamem.args              |     2 +-
 tests/qemuxml2argvdata/video-vga-device.args  |     2 +-
 .../qemuxml2argvdata/video-vga-qxl-heads.args |     2 +-
 .../video-virtio-gpu-ccw.args                 |     4 +-
 .../video-virtio-gpu-device.args              |     2 +-
 .../video-virtio-gpu-secondary.args           |     2 +-
 .../video-virtio-gpu-spice-gl.args            |     2 +-
 .../video-virtio-gpu-virgl.args               |     2 +-
 tests/qemuxml2argvdata/video-virtio-vga.args  |     2 +-
 .../virtio-input-passthrough.args             |     2 +-
 tests/qemuxml2argvdata/virtio-input.args      |     2 +-
 .../virtio-non-transitional.x86_64-3.1.0.args |    53 -
 tests/qemuxml2argvdata/virtio-rng-ccw.args    |     2 +-
 .../qemuxml2argvdata/virtio-rng-default.args  |     2 +-
 tests/qemuxml2argvdata/virtio-rng-egd.args    |     2 +-
 .../qemuxml2argvdata/virtio-rng-multiple.args |     2 +-
 tests/qemuxml2argvdata/virtio-rng-random.args |     2 +-
 .../virtio-transitional.x86_64-3.1.0.args     |    46 -
 tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
 .../x86-kvm-32-on-64.x86_64-4.1.0.args        |    31 -
 tests/qemuxml2argvtest.c                      |    93 +-
 .../x86-kvm-32-on-64.x86_64-4.1.0.xml         |    24 -
 tests/qemuxml2xmltest.c                       |    21 +-
 590 files changed, 495 insertions(+), 218552 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
 delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
 delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:06 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:06 +0200
Subject: [PATCH 01/20] qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
 'x86-kvm-32-on-64'
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <1a4c240e4883477ffc8b703d283a6287cabb8e19.1657884290.git.pkrempa@redhat.com>

Upcoming patches will bump minimum qemu version to 4.2. In this case we
the 'latest' case is suffuicient as with qemu-4.2 we already behave as
upstream ('qemu64' cpu is used instead of 'qemu32').

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../x86-kvm-32-on-64.x86_64-4.1.0.args        | 31 -------------------
 tests/qemuxml2argvtest.c                      |  1 -
 .../x86-kvm-32-on-64.x86_64-4.1.0.xml         | 24 --------------
 tests/qemuxml2xmltest.c                       |  1 -
 4 files changed, 57 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml

diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
deleted file mode 100644
index 8e9012e7a8..0000000000
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-kvm \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-kvm/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=kvm,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-kvm/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu qemu32 \
--m 4096 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5b40a0d7f5..78b89ee91a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1074,7 +1074,6 @@ mymain(void)
             QEMU_CAPS_MACHINE_VMPORT_OPT);
     DO_TEST_NOCAPS("default-kvm-host-arch");
     DO_TEST_NOCAPS("default-qemu-host-arch");
-    DO_TEST_CAPS_VER("x86-kvm-32-on-64", "4.1.0");
     DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");
     DO_TEST_NOCAPS("boot-cdrom");
     DO_TEST_NOCAPS("boot-network");
diff --git a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml b/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
deleted file mode 100644
index 934ec8ef07..0000000000
--- a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='kvm'>
-  <name>kvm</name>
-  <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-  <memory unit='KiB'>4194304</memory>
-  <currentMemory unit='KiB'>4194304</currentMemory>
-  <vcpu placement='static'>1</vcpu>
-  <os>
-    <type arch='i686' machine='pc-i440fx-4.1'>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='usb' index='0' model='none'/>
-    <controller type='pci' index='0' model='pci-root'/>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <audio id='1' type='none'/>
-    <memballoon model='none'/>
-  </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 58929b68c1..4eabefada0 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1331,7 +1331,6 @@ mymain(void)
     DO_TEST("riscv64-virt-pci",
             QEMU_CAPS_OBJECT_GPEX);

-    DO_TEST_CAPS_VER("x86-kvm-32-on-64", "4.1.0");
     DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");

     DO_TEST_CAPS_LATEST("virtio-transitional");
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:08 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:08 +0200
Subject: [PATCH 03/20] qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio
 tests
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <94388c58e911d9cd644d76037c68e31f4958975d.1657884290.git.pkrempa@redhat.com>

Minimum qemu version will be bumped to qemu-4.2 so we no longer need to
care about configuring audiodevs via the environment variables.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../audio-alsa-best.x86_64-4.1.0.args         | 46 -----------------
 .../audio-alsa-full.x86_64-4.1.0.err          |  1 -
 .../audio-alsa-minimal.x86_64-4.1.0.args      | 33 -------------
 .../audio-coreaudio-best.x86_64-4.1.0.args    | 46 -----------------
 .../audio-coreaudio-full.x86_64-4.1.0.err     |  1 -
 .../audio-coreaudio-minimal.x86_64-4.1.0.args | 33 -------------
 ...audio-default-nographics.x86_64-4.1.0.args | 33 -------------
 .../audio-file-best.x86_64-4.1.0.args         | 45 -----------------
 .../audio-file-full.x86_64-4.1.0.err          |  1 -
 .../audio-file-minimal.x86_64-4.1.0.args      | 33 -------------
 .../audio-jack-full.x86_64-4.1.0.err          |  1 -
 .../audio-jack-minimal.x86_64-4.1.0.err       |  1 -
 .../audio-many-backends.x86_64-4.1.0.err      |  1 -
 .../audio-none-best.x86_64-4.1.0.args         | 44 -----------------
 .../audio-none-full.x86_64-4.1.0.err          |  1 -
 .../audio-none-minimal.x86_64-4.1.0.args      | 33 -------------
 .../audio-oss-best.x86_64-4.1.0.args          | 49 -------------------
 .../audio-oss-full.x86_64-4.1.0.err           |  1 -
 .../audio-oss-minimal.x86_64-4.1.0.args       | 33 -------------
 .../audio-pulseaudio-best.x86_64-4.1.0.args   | 48 ------------------
 .../audio-pulseaudio-full.x86_64-4.1.0.err    |  1 -
 ...audio-pulseaudio-minimal.x86_64-4.1.0.args | 33 -------------
 .../audio-sdl-best.x86_64-4.1.0.args          | 46 -----------------
 .../audio-sdl-full.x86_64-4.1.0.err           |  1 -
 .../audio-sdl-minimal.x86_64-4.1.0.args       | 33 -------------
 .../audio-spice-best.x86_64-4.1.0.args        | 45 -----------------
 .../audio-spice-full.x86_64-4.1.0.err         |  1 -
 .../audio-spice-minimal.x86_64-4.1.0.args     | 34 -------------
 tests/qemuxml2argvtest.c                      | 35 -------------
 29 files changed, 713 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args

File deletions are truncated from the mail posting.


diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b801bd43d8..8d76472c0c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1094,17 +1094,6 @@ mymain(void)
     DO_TEST("boot-complex",
             QEMU_CAPS_VIRTIO_BLK_SCSI);

-    /* Simplest possible <audio>, all supported with ENV */
-    DO_TEST_CAPS_VER("audio-none-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-alsa-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-coreaudio-minimal", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-oss-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-pulseaudio-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-sdl-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-spice-minimal", "4.1.0");
-    DO_TEST_CAPS_VER("audio-file-minimal", "4.1.0");
-
     DO_TEST_CAPS_LATEST("audio-none-minimal");
     DO_TEST_CAPS_LATEST("audio-alsa-minimal");
     DO_TEST_CAPS_LATEST("audio-coreaudio-minimal");
@@ -1115,16 +1104,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-minimal");
     DO_TEST_CAPS_LATEST("audio-file-minimal");

-    /* Best <audio> still compat with old ENV */
-    DO_TEST_CAPS_VER("audio-none-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-alsa-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-coreaudio-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-oss-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-pulseaudio-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-sdl-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-spice-best", "4.1.0");
-    DO_TEST_CAPS_VER("audio-file-best", "4.1.0");
-
     DO_TEST_CAPS_LATEST("audio-none-best");
     DO_TEST_CAPS_LATEST("audio-alsa-best");
     DO_TEST_CAPS_LATEST("audio-coreaudio-best");
@@ -1134,17 +1113,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-best");
     DO_TEST_CAPS_LATEST("audio-file-best");

-    /* Full <audio> only compat with new QEMU -audiodev args */
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-none-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-alsa-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-coreaudio-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-oss-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-pulseaudio-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-sdl-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-spice-full", "4.1.0");
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-file-full", "4.1.0");
-
     DO_TEST_CAPS_LATEST("audio-none-full");
     DO_TEST_CAPS_LATEST("audio-alsa-full");
     DO_TEST_CAPS_LATEST("audio-coreaudio-full");
@@ -1155,8 +1123,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("audio-spice-full");
     DO_TEST_CAPS_LATEST("audio-file-full");

-    /* Multiple backends not supported with ENV */
-    DO_TEST_CAPS_VER_PARSE_ERROR("audio-many-backends", "4.1.0");
     DO_TEST_CAPS_LATEST("audio-many-backends");

     /* Validate auto-creation of <audio> for legacy compat */
@@ -1179,7 +1145,6 @@ mymain(void)

     g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
     driver.config->nogfxAllowHostAudio = true;
-    DO_TEST_CAPS_VER("audio-default-nographics", "4.1.0");
     DO_TEST_CAPS_LATEST("audio-default-nographics");
     driver.config->nogfxAllowHostAudio = false;
     g_unsetenv("QEMU_AUDIO_DRV");
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:09 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:09 +0200
Subject: [PATCH 04/20] qemuxml2argvtest: Remove 'qemu-3.1' versions of
 virtio-(non-)transitional tests
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <a77015b25c162f1cef1066d0a08369b82efda365.1657884290.git.pkrempa@redhat.com>

Starting from qemu-4.0 a new device model name is used instead of the
'disable_*' props. Since we are going to bump to qemu-4.2 as minimum
this test can be removed.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../virtio-non-transitional.x86_64-3.1.0.args | 53 -------------------
 .../virtio-transitional.x86_64-3.1.0.args     | 46 ----------------
 tests/qemuxml2argvtest.c                      |  3 --
 3 files changed, 102 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args

diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
deleted file mode 100644
index 2d0e568bb0..0000000000
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ /dev/null
@@ -1,53 +0,0 @@
-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-q35-3.1,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device pcie-root-port,port=11,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
--device pcie-root-port,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
--device pcie-root-port,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
--device pcie-root-port,port=14,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
--device pcie-root-port,port=15,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
--device pcie-root-port,port=16,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,addr=0x2 \
--device pcie-root-port,port=17,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x1 \
--device virtio-scsi-pci,disable-legacy=on,disable-modern=off,id=scsi0,bus=pci.4,addr=0x0 \
--device virtio-serial-pci,disable-legacy=on,disable-modern=off,id=virtio-serial0,bus=pci.3,addr=0x0 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,disable-legacy=on,disable-modern=off,scsi=off,bus=pci.5,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
--device virtio-9p-pci,disable-legacy=on,disable-modern=off,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.1,addr=0x0 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,disable-legacy=on,disable-modern=off,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x0 \
--device vhost-scsi-pci,disable-legacy=on,disable-modern=off,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.6,addr=0x0 \
--device virtio-balloon-pci,disable-legacy=on,disable-modern=off,id=balloon0,bus=pci.7,addr=0x0 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,disable-legacy=on,disable-modern=off,rng=objrng0,id=rng0,bus=pci.8,addr=0x0 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device vhost-vsock-pci,disable-legacy=on,disable-modern=off,id=vsock0,guest-cid=4,vhostfd=6789,bus=pci.9,addr=0x0 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
deleted file mode 100644
index 83bb5d137d..0000000000
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ /dev/null
@@ -1,46 +0,0 @@
-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-q35-3.1,usb=off,dump-guest-core=off \
--accel tcg \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
--device pcie-root-port,port=9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
--device virtio-scsi-pci,disable-legacy=off,disable-modern=off,id=scsi0,bus=pci.2,addr=0x4 \
--device virtio-serial-pci,disable-legacy=off,disable-modern=off,id=virtio-serial0,bus=pci.2,addr=0x3 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,disable-legacy=off,disable-modern=off,scsi=off,bus=pci.2,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
--device virtio-9p-pci,disable-legacy=off,disable-modern=off,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.2,addr=0x1 \
--netdev user,id=hostnet0 \
--device virtio-net-pci,disable-legacy=off,disable-modern=off,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x2 \
--device vhost-scsi-pci,disable-legacy=off,disable-modern=off,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.2,addr=0x6 \
--device virtio-balloon-pci,disable-legacy=off,disable-modern=off,id=balloon0,bus=pci.2,addr=0x7 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device virtio-rng-pci,disable-legacy=off,disable-modern=off,rng=objrng0,id=rng0,bus=pci.2,addr=0x8 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device vhost-vsock-pci,disable-legacy=off,disable-modern=off,id=vsock0,guest-cid=4,vhostfd=6789,bus=pci.2,addr=0x9 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8d76472c0c..d65a18f8d4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3310,9 +3310,6 @@ mymain(void)
     DO_TEST("riscv64-virt-pci",
             QEMU_CAPS_OBJECT_GPEX);

-    /* Older version checks disable-legacy usage */
-    DO_TEST_CAPS_VER("virtio-transitional", "3.1.0");
-    DO_TEST_CAPS_VER("virtio-non-transitional", "3.1.0");
     DO_TEST_CAPS_LATEST("virtio-transitional");
     DO_TEST_CAPS_LATEST("virtio-non-transitional");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported");
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:07 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:07 +0200
Subject: [PATCH 02/20] tests: qemuxml2argv: Remove pre-blockdev versions of
 disk-related tests
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <e64257149177b780ab1b37c1dcda3c4b78f4e676.1657884290.git.pkrempa@redhat.com>

Upcoming patches will bump minimum supported qemu version to 4.2 which
will use '-blockdev' with qemu so we can drop all the old test cases for
pre-blockdev configs.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../blkdeviotune-group-num.x86_64-4.1.0.args  | 37 --------------
 .../blkdeviotune-max-length.x86_64-4.1.0.args | 37 --------------
 .../blkdeviotune-max.x86_64-4.1.0.args        | 37 --------------
 .../disk-aio.x86_64-4.1.0.args                | 36 -------------
 .../disk-arm-virtio-sd.aarch64-4.0.0.args     | 38 --------------
 ...isk-backing-chains-index.x86_64-4.1.0.args | 45 ----------------
 ...k-backing-chains-noindex.x86_64-4.1.0.args |  1 -
 .../disk-cache.x86_64-3.1.0.args              | 42 ---------------
 .../disk-cache.x86_64-4.1.0.args              | 42 ---------------
 .../disk-cdrom-network.x86_64-4.1.0.args      | 39 --------------
 .../disk-cdrom-tray.x86_64-4.1.0.args         | 38 --------------
 .../disk-cdrom.x86_64-4.1.0.args              | 39 --------------
 .../disk-copy_on_read.x86_64-4.1.0.args       | 39 --------------
 .../disk-detect-zeroes.x86_64-4.1.0.args      | 37 --------------
 .../disk-discard.x86_64-4.1.0.args            | 36 -------------
 .../disk-error-policy-s390x.s390x-4.0.0.args  | 35 -------------
 .../disk-error-policy.x86_64-4.1.0.args       | 37 --------------
 .../disk-floppy-q35.x86_64-4.1.0.args         | 36 -------------
 .../disk-floppy.x86_64-4.1.0.args             | 37 --------------
 .../disk-fmt-qcow.x86_64-4.1.0.args           | 35 -------------
 .../disk-network-gluster.x86_64-4.1.0.args    | 37 --------------
 .../disk-network-iscsi.x86_64-4.1.0.args      | 49 ------------------
 .../disk-network-nbd.x86_64-4.1.0.args        | 41 ---------------
 ...disk-network-rbd-no-colon.x86_64-4.1.0.err |  1 -
 .../disk-network-rbd.x86_64-4.1.0.args        | 44 ----------------
 .../disk-network-sheepdog.x86_64-4.1.0.args   | 35 -------------
 ...disk-network-source-auth.x86_64-4.1.0.args | 40 ---------------
 ...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 -------------
 ...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 ---------------
 .../disk-readonly-disk.x86_64-4.1.0.args      | 36 -------------
 .../disk-shared.x86_64-3.1.0.args             | 41 ---------------
 .../disk-shared.x86_64-4.1.0.args             | 41 ---------------
 .../disk-source-pool-mode.x86_64-4.1.0.args   | 40 ---------------
 .../disk-source-pool.x86_64-4.1.0.args        | 42 ---------------
 .../disk-transient.x86_64-4.1.0.err           |  1 -
 ...virtio-scsi-reservations.x86_64-4.1.0.args | 39 --------------
 .../encrypted-disk-usage.x86_64-4.1.0.args    | 35 -------------
 .../encrypted-disk.x86_64-4.1.0.args          | 35 -------------
 ...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |  1 -
 .../floppy-drive-fat.x86_64-4.1.0.args        | 35 -------------
 .../hostdev-scsi-lsi.x86_64-4.1.0.args        | 49 ------------------
 ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 51 -------------------
 .../luks-disks-source.x86_64-4.1.0.args       | 48 -----------------
 .../luks-disks.x86_64-4.1.0.args              | 39 --------------
 tests/qemuxml2argvtest.c                      | 45 ----------------
 45 files changed, 1624 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
 delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
 delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args


 Truncated all the file deletions.

 [...]

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 78b89ee91a..b801bd43d8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1202,7 +1202,6 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
-    DO_TEST_CAPS_VER_PARSE_ERROR("firmware-manual-efi-nvram-network-iscsi", "4.1.0");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");

@@ -1335,18 +1334,12 @@ mymain(void)

     DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW);

-    /* qemu-4.1 was the last qemu version which we didn't use -blockdev with */
-    DO_TEST_CAPS_VER("disk-cdrom", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-cdrom");
     DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
     DO_TEST_CAPS_LATEST("disk-cdrom-bus-other");
-    DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-cdrom-network");
-    DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-cdrom-tray");
-    DO_TEST_CAPS_VER("disk-floppy", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-floppy");
-    DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-floppy-q35");
     DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries", "ppc64");
     DO_TEST_CAPS_LATEST("disk-floppy-tray");
@@ -1358,57 +1351,38 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-virtio-queues");
     DO_TEST_CAPS_LATEST("disk-boot-disk");
     DO_TEST_CAPS_LATEST("disk-boot-cdrom");
-    DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0");
     DO_TEST_CAPS_LATEST("floppy-drive-fat");
-    DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-readonly-disk");
-    DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-fmt-qcow");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso");
-    DO_TEST_CAPS_VER("disk-shared", "3.1.0");
-    DO_TEST_CAPS_VER("disk-shared", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-shared");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow");
-    DO_TEST_CAPS_VER("disk-error-policy", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-error-policy");
-    DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x", "4.0.0");
     DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x");
-    DO_TEST_CAPS_VER("disk-cache", "3.1.0");
-    DO_TEST_CAPS_VER("disk-cache", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-cache");
     DO_TEST_CAPS_LATEST("disk-metadata-cache");
-    DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-transient");
-    DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-nbd");
-    DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-iscsi");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both");
-    DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-gluster");
-    DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-rbd");
     DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption", "6.0.0");
     DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-encryption-wrong");
-    DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon");
-    DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0");
     /* qemu-6.0 is the last qemu version supporting sheepdog */
     DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0");
-    DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-source-auth");
     DO_TEST_CAPS_LATEST("disk-network-nfs");
     driver.config->vxhsTLS = 1;
     driver.config->nbdTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
     driver.config->vxhsTLSx509secretUUID = g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
-    DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0");
     DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0");
-    DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
     DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname", "6.2.0");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
@@ -1434,19 +1408,13 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error");
     DO_TEST_CAPS_LATEST("controller-virtio-scsi");
     DO_TEST_CAPS_LATEST("disk-sata-device");
-    DO_TEST_CAPS_VER("disk-aio", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-aio");
     DO_TEST_CAPS_LATEST("disk-aio-io_uring");
-    DO_TEST_CAPS_VER("disk-source-pool", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-source-pool");
-    DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-source-pool-mode");
     DO_TEST_CAPS_LATEST("disk-ioeventfd");
-    DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-copy_on_read");
-    DO_TEST_CAPS_VER("disk-discard", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-discard");
-    DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-detect-zeroes");
     DO_TEST_CAPS_LATEST("disk-snapshot");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets");
@@ -1462,24 +1430,17 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address");
-    DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-backing-chains-index");
-    DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0");
     DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");

     DO_TEST_CAPS_LATEST("disk-slices");
     DO_TEST_CAPS_LATEST("disk-rotation");

-    DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64", "4.0.0");
     DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");

-    DO_TEST_CAPS_VER("encrypted-disk", "4.1.0");
     DO_TEST_CAPS_LATEST("encrypted-disk");
-    DO_TEST_CAPS_VER("encrypted-disk-usage", "4.1.0");
     DO_TEST_CAPS_LATEST("encrypted-disk-usage");
-    DO_TEST_CAPS_VER("luks-disks", "4.1.0");
     DO_TEST_CAPS_LATEST("luks-disks");
-    DO_TEST_CAPS_VER("luks-disks-source", "4.1.0");
     DO_TEST_CAPS_LATEST("luks-disks-source");
     DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
     DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
@@ -1491,7 +1452,6 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-geometry");
     DO_TEST_CAPS_LATEST("disk-blockio");

-    DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0");
     DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0");
     DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");

@@ -2179,11 +2139,8 @@ mymain(void)
     DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
     DO_TEST_NOCAPS("numad-static-memory-auto-vcpu");
     DO_TEST_CAPS_LATEST("blkdeviotune");
-    DO_TEST_CAPS_VER("blkdeviotune-max", "4.1.0");
     DO_TEST_CAPS_LATEST("blkdeviotune-max");
-    DO_TEST_CAPS_VER("blkdeviotune-group-num", "4.1.0");
     DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
-    DO_TEST_CAPS_VER("blkdeviotune-max-length", "4.1.0");
     DO_TEST_CAPS_LATEST("blkdeviotune-max-length");

     DO_TEST("multifunction-pci-device",
@@ -2834,9 +2791,7 @@ mymain(void)
                         QEMU_CAPS_DEVICE_PXB_PCIE);
     DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64", "aarch64");

-    DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0");
     DO_TEST_CAPS_LATEST("hostdev-scsi-lsi");
-    DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0");
     DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");

     DO_TEST("hostdev-scsi-vhost-scsi-ccw",
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:11 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:11 +0200
Subject: [PATCH 06/20] qemuxml2argvtest: Remove 'qemu-4.0' version of
 aarch64-features-sve case
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <f18dcbe60103ffb1bdb6223770fb1b6a2045ac36.1657884290.git.pkrempa@redhat.com>

Minimum qemu will be bumped to 4.2 so this test no longer makes sense.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err | 1 -
 tests/qemuxml2argvtest.c                                      | 2 --
 2 files changed, 3 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err

diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
deleted file mode 100644
index 471b22708a..0000000000
--- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
+++ /dev/null
@@ -1 +0,0 @@
-internal error: CPU features not supported by hypervisor for aarch64 architecture
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3d5ded60d7..e850d607a8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2946,8 +2946,6 @@ mymain(void)
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_PCI_SERIAL);

-    /* QEMU 4.0.0 didn't have support for aarch64 CPU features */
-    DO_TEST_CAPS_ARCH_VER_FAILURE("aarch64-features-sve", "aarch64", "4.0.0");
     /* aarch64 doesn't support the same CPU features as x86 */
     DO_TEST_CAPS_ARCH_LATEST_FAILURE("aarch64-features-wrong", "aarch64");
     /* Can't enable vector lengths when SVE is overall disabled */
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:12 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:12 +0200
Subject: [PATCH 07/20] qemuxml2argvtest: Remove 'qemu-4.0' versions of
 'cpu-host-model-cmt' and 'cpu-tsc-frequency'
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <bec5c7aeac7dd021208f178b19fe597fa5d9c58d.1657884290.git.pkrempa@redhat.com>

Minimum qemu version is going to be bumped to qemu-4.2. Upgrading the
version of these tests don't make sense as the host cpu in the real
capabilities doesn't support the features the tests are attempting to
test.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../cpu-host-model-cmt.x86_64-4.0.0.args      | 33 -------------------
 .../cpu-tsc-frequency.x86_64-4.0.0.args       | 33 -------------------
 tests/qemuxml2argvtest.c                      |  2 --
 3 files changed, 68 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args

diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
deleted file mode 100644
index 0de09e1d88..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off \
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--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-tsc-frequency.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
deleted file mode 100644
index ba1606704f..0000000000
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-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-i440fx-4.0,usb=off,dump-guest-core=off \
--accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,tsc-frequency=4567890000 \
--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=on,wait=off \
--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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e850d607a8..4897d2f87b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2044,8 +2044,6 @@ mymain(void)
     DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
     qemuTestSetHostCPU(&driver, driver.hostarch, NULL);

-    DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
-    DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
     DO_TEST_CAPS_LATEST("cpu-translation");

     DO_TEST_NOCAPS("memtune");
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:13 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:13 +0200
Subject: [PATCH 08/20] tests: qemucapabilities: Remove qemu-3.1 test data
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <43a27286ee48c10144b92bcf9f54eec2051bf496.1657884290.git.pkrempa@redhat.com>

Upcoming patches will raise the minimum required qemu version to 4.2.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../caps_3.1.0.ppc64.replies                  | 23732 ---------------
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
 .../caps_3.1.0.x86_64.replies                 | 24428 ----------------
 .../caps_3.1.0.x86_64.xml                     |  1387 -
 4 files changed, 50619 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml

Truncated for mail posting.

From pkrempa at redhat.com  Fri Jul 15 11:44:10 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:10 +0200
Subject: [PATCH 05/20] qemuxml2argvtest: Remove pre-qemu-4.2 versions of
 'cpu-host-model' test
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <a343c53e0005501c1cb2b60f7c95c0341c107cd4.1657884290.git.pkrempa@redhat.com>

Minimum qemu will be bumped to 4.2 so remove the older test cases.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../cpu-host-model.x86_64-3.1.0.args          | 36 -------------------
 .../cpu-host-model.x86_64-4.0.0.args          | 36 -------------------
 .../cpu-host-model.x86_64-4.1.0.args          | 36 -------------------
 tests/qemuxml2argvtest.c                      |  3 --
 4 files changed, 111 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
 delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args

diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
deleted file mode 100644
index f7e48be757..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-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-q35-3.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,xsaves=on,pdpe1gb=on \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
deleted file mode 100644
index 4c7fcf8a31..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-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-q35-4.0,usb=off,dump-guest-core=off \
--accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
deleted file mode 100644
index 8e126568d0..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-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-q35-4.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on \
--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=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
--device virtio-balloon-pci,id=balloon0,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 d65a18f8d4..3d5ded60d7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2009,9 +2009,6 @@ mymain(void)

     /* host-model cpu expansion depends on the cpu reported by qemu and thus
      * we invoke it for all real capability dumps we have */
-    DO_TEST_CAPS_VER("cpu-host-model", "3.1.0");
-    DO_TEST_CAPS_VER("cpu-host-model", "4.0.0");
-    DO_TEST_CAPS_VER("cpu-host-model", "4.1.0");
     DO_TEST_CAPS_VER("cpu-host-model", "4.2.0");
     DO_TEST_CAPS_VER("cpu-host-model", "5.0.0");
     DO_TEST_CAPS_VER("cpu-host-model", "5.1.0");
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:14 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:14 +0200
Subject: [PATCH 09/20] tests: domaincaps: Remove test data for qemu-3.1
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <dc1b71acf5f908e26a263c2da5eb8d427911c3b6.1657884290.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  | 211 ----------------
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  | 230 ------------------
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     | 138 -----------
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    | 211 ----------------
 4 files changed, 790 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml

 Truncated.

From pkrempa at redhat.com  Fri Jul 15 11:44:15 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:15 +0200
Subject: [PATCH 10/20] qemucapabilitiestest: Remove test data for qemu-4.0
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <1e324a987bfe4f4b84cb5697c1362e2f31fa847d.1657884290.git.pkrempa@redhat.com>

qemu-4.0 will no longer be supported, remove the test data.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../caps_4.0.0.aarch64.replies                | 20893 -------------
 .../caps_4.0.0.aarch64.xml                    |   363 -
 .../caps_4.0.0.ppc64.replies                  | 24461 ---------------
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
 .../caps_4.0.0.riscv32.replies                | 18154 -----------
 .../caps_4.0.0.riscv32.xml                    |   157 -
 .../caps_4.0.0.riscv64.replies                | 18154 -----------
 .../caps_4.0.0.riscv64.xml                    |   157 -
 .../caps_4.0.0.s390x.replies                  | 21721 --------------
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
 .../caps_4.0.0.x86_64.replies                 | 25001 ----------------
 .../caps_4.0.0.x86_64.xml                     |  1398 -
 12 files changed, 134441 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml

 Trucated.

From pkrempa at redhat.com  Fri Jul 15 11:44:16 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:16 +0200
Subject: [PATCH 11/20] domaincapstest: Remove test data for qemu-4.0
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <208d6abddcc3a8263744d91eaaa328dc9ba91917.1657884290.git.pkrempa@redhat.com>

qemu-4.0 will no longer be supported.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  | 211 ----------------
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  | 230 -----------------
 .../qemu_4.0.0-virt.aarch64.xml               | 179 -------------
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   | 173 -------------
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     | 139 -----------
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     | 236 ------------------
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    | 211 ----------------
 7 files changed, 1379 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml

Truncated.

From pkrempa at redhat.com  Fri Jul 15 11:44:17 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:17 +0200
Subject: [PATCH 12/20] qemucapabilitiestest: Remove test data for qemu-4.1
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <4976be6e8c63e42411e75ede76d47d5932357f85.1657884290.git.pkrempa@redhat.com>

qemu-4.1 will not be supported any more.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../caps_4.1.0.x86_64.replies                 | 25198 ----------------
 .../caps_4.1.0.x86_64.xml                     |  1971 --
 2 files changed, 27169 deletions(-)
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
 delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml

Truncated.

From pkrempa at redhat.com  Fri Jul 15 11:44:19 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:19 +0200
Subject: [PATCH 14/20] qemu: Formally deprecate support for qemu < 4.2
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <6f24d83a46323f23bc2db6457e606f7db6c14397.1657884290.git.pkrempa@redhat.com>

Per [1] the Debian 10 reaches EOL in August of 2022. This allows us to
bump the minimum supported qemu version to qemu-4.2 which will also
allow us to do significant cleanups.

This commit bumps the minimum qemu verison and updates the corresponding
docs.

[1]: https://wiki.debian.org/DebianReleases

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 docs/drvqemu.rst             | 2 +-
 src/qemu/qemu_capabilities.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst
index c9f2432268..5fb98fafd2 100644
--- a/docs/drvqemu.rst
+++ b/docs/drvqemu.rst
@@ -5,7 +5,7 @@
 QEMU/KVM/HVF hypervisor driver
 ==============================

-The libvirt KVM/QEMU driver can manage any QEMU emulator from version 3.1.0 or
+The libvirt KVM/QEMU driver can manage any QEMU emulator from version 4.2.0 or
 later.

 It supports multiple QEMU accelerators: software
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index fa8ffd19ca..c02fef6acd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5364,8 +5364,8 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps,
     return 0;
 }

-#define QEMU_MIN_MAJOR 3
-#define QEMU_MIN_MINOR 1
+#define QEMU_MIN_MAJOR 4
+#define QEMU_MIN_MINOR 2
 #define QEMU_MIN_MICRO 0

 virDomainVirtType
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:18 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:18 +0200
Subject: [PATCH 13/20] domaincapstest: Remove test data for qemu-4.1
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <51f41378849fe32ee7847843c9825fb7d864e65d.1657884290.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  | 217 ----------------
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  | 233 ------------------
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    | 217 ----------------
 3 files changed, 667 deletions(-)
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
 delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml

Truncated.

From pkrempa at redhat.com  Fri Jul 15 11:44:20 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:20 +0200
Subject: [PATCH 15/20] qemu: command: Always assume QEMU_CAPS_AUDIODEV
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <d162ff0279eab4cee9791e04cb03e5fbb639b021.1657884290.git.pkrempa@redhat.com>

Generate only new version of the '-audiodev' commandline. The leftover
old code and validation will be removed in subsequent patches.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c                       | 29 +++++++------------
 .../aarch64-aavmf-virtio-mmio.args            |  2 +-
 .../aarch64-cpu-passthrough.args              |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-host.args  |  2 +-
 .../aarch64-gic-none-tcg.args                 |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-v2.args    |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-v3.args    |  2 +-
 .../aarch64-kvm-32-on-64.args                 |  2 +-
 .../qemuxml2argvdata/aarch64-pci-serial.args  |  2 +-
 .../aarch64-traditional-pci.args              |  2 +-
 .../aarch64-usb-controller-nec-xhci.args      |  2 +-
 .../aarch64-usb-controller-qemu-xhci.args     |  2 +-
 .../aarch64-video-default.args                |  4 +--
 .../aarch64-video-virtio-gpu-pci.args         |  2 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |  2 +-
 .../aarch64-virt-default-nic.args             |  2 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |  2 +-
 .../aarch64-virtio-pci-default.args           |  2 +-
 .../aarch64-virtio-pci-manual-addresses.args  |  2 +-
 tests/qemuxml2argvdata/acpi-table.args        |  2 +-
 .../arm-vexpressa9-basic.args                 |  2 +-
 .../arm-vexpressa9-nodevs.args                |  2 +-
 .../arm-vexpressa9-virtio.args                |  2 +-
 tests/qemuxml2argvdata/arm-virt-virtio.args   |  2 +-
 tests/qemuxml2argvdata/audio-default-sdl.args |  2 +-
 .../qemuxml2argvdata/audio-default-spice.args |  2 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |  4 +--
 tests/qemuxml2argvdata/autoindex.args         |  2 +-
 .../qemuxml2argvdata/balloon-ccw-deflate.args |  2 +-
 .../qemuxml2argvdata/balloon-device-auto.args |  2 +-
 .../balloon-device-deflate-off.args           |  2 +-
 .../balloon-device-deflate.args               |  2 +-
 .../balloon-device-period.args                |  2 +-
 tests/qemuxml2argvdata/balloon-device.args    |  2 +-
 .../balloon-mmio-deflate.args                 |  2 +-
 tests/qemuxml2argvdata/blkiotune-device.args  |  2 +-
 tests/qemuxml2argvdata/blkiotune.args         |  2 +-
 tests/qemuxml2argvdata/boot-cdrom.args        |  2 +-
 tests/qemuxml2argvdata/boot-complex.args      |  2 +-
 tests/qemuxml2argvdata/boot-floppy-q35.args   |  2 +-
 tests/qemuxml2argvdata/boot-floppy.args       |  2 +-
 .../boot-menu-disable-drive.args              |  2 +-
 tests/qemuxml2argvdata/boot-menu-disable.args |  2 +-
 .../boot-menu-enable-with-timeout.args        |  2 +-
 tests/qemuxml2argvdata/boot-menu-enable.args  |  2 +-
 tests/qemuxml2argvdata/boot-multi.args        |  2 +-
 tests/qemuxml2argvdata/boot-network.args      |  2 +-
 tests/qemuxml2argvdata/boot-order.args        |  2 +-
 tests/qemuxml2argvdata/channel-guestfwd.args  |  2 +-
 tests/qemuxml2argvdata/channel-spicevmc.args  |  2 +-
 .../qemuxml2argvdata/channel-virtio-auto.args |  2 +-
 .../channel-virtio-autoadd.args               |  2 +-
 .../channel-virtio-autoassign.args            |  2 +-
 .../channel-virtio-default.args               |  2 +-
 .../channel-virtio-state.args                 |  2 +-
 .../qemuxml2argvdata/channel-virtio-unix.args |  2 +-
 tests/qemuxml2argvdata/channel-virtio.args    |  2 +-
 tests/qemuxml2argvdata/chardev-reconnect.args |  2 +-
 tests/qemuxml2argvdata/clock-catchup.args     |  2 +-
 tests/qemuxml2argvdata/clock-france.args      |  2 +-
 tests/qemuxml2argvdata/clock-hpet-off.args    |  2 +-
 .../clock-localtime-basis-localtime.args      |  2 +-
 tests/qemuxml2argvdata/clock-localtime.args   |  2 +-
 tests/qemuxml2argvdata/clock-realtime.args    |  2 +-
 .../clock-timer-hyperv-rtc.args               |  2 +-
 tests/qemuxml2argvdata/clock-utc.args         |  2 +-
 tests/qemuxml2argvdata/clock-variable.args    |  2 +-
 .../qemuxml2argvdata/console-compat-auto.args |  2 +-
 .../console-compat-chardev.args               |  2 +-
 tests/qemuxml2argvdata/console-compat.args    |  2 +-
 .../qemuxml2argvdata/console-virtio-ccw.args  |  2 +-
 .../qemuxml2argvdata/console-virtio-many.args |  2 +-
 tests/qemuxml2argvdata/console-virtio.args    |  2 +-
 tests/qemuxml2argvdata/controller-order.args  |  4 +--
 tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell.args       |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell2.args      |  2 +-
 tests/qemuxml2argvdata/cpu-Haswell3.args      |  2 +-
 tests/qemuxml2argvdata/cpu-cache-disable.args |  2 +-
 .../qemuxml2argvdata/cpu-cache-disable2.args  |  2 +-
 .../qemuxml2argvdata/cpu-cache-disable3.args  |  2 +-
 .../cpu-cache-emulate-l3.args                 |  2 +-
 .../cpu-cache-passthrough.args                |  2 +-
 .../cpu-cache-passthrough2.args               |  2 +-
 .../cpu-check-default-none.args               |  2 +-
 .../cpu-check-default-none2.args              |  2 +-
 .../cpu-check-default-partial.args            |  2 +-
 .../cpu-check-default-partial2.args           |  2 +-
 tests/qemuxml2argvdata/cpu-check-none.args    |  2 +-
 tests/qemuxml2argvdata/cpu-exact1.args        |  2 +-
 .../cpu-exact2-nofallback.args                |  2 +-
 tests/qemuxml2argvdata/cpu-exact2.args        |  2 +-
 tests/qemuxml2argvdata/cpu-fallback.args      |  2 +-
 tests/qemuxml2argvdata/cpu-host-kvmclock.args |  2 +-
 .../qemuxml2argvdata/cpu-host-model-cmt.args  |  2 +-
 .../cpu-host-model-fallback.args              |  2 +-
 .../cpu-host-model-vendor.args                |  2 +-
 tests/qemuxml2argvdata/cpu-host-model.args    |  2 +-
 .../cpu-host-passthrough-features.args        |  2 +-
 .../cpu-host-passthrough.args                 |  2 +-
 .../qemuxml2argvdata/cpu-hotplug-startup.args |  2 +-
 tests/qemuxml2argvdata/cpu-kvmclock.args      |  2 +-
 tests/qemuxml2argvdata/cpu-minimum1.args      |  2 +-
 tests/qemuxml2argvdata/cpu-minimum2.args      |  2 +-
 .../cpu-no-removed-features.args              |  2 +-
 tests/qemuxml2argvdata/cpu-numa-disjoint.args |  2 +-
 .../qemuxml2argvdata/cpu-numa-memshared.args  |  2 +-
 .../cpu-numa-no-memory-element.args           |  2 +-
 tests/qemuxml2argvdata/cpu-numa1.args         |  2 +-
 tests/qemuxml2argvdata/cpu-numa2.args         |  2 +-
 tests/qemuxml2argvdata/cpu-s390-features.args |  2 +-
 tests/qemuxml2argvdata/cpu-s390-zEC12.args    |  2 +-
 tests/qemuxml2argvdata/cpu-strict1.args       |  2 +-
 tests/qemuxml2argvdata/cpu-topology1.args     |  2 +-
 tests/qemuxml2argvdata/cpu-topology2.args     |  2 +-
 tests/qemuxml2argvdata/cpu-topology3.args     |  2 +-
 tests/qemuxml2argvdata/cpu-tsc-frequency.args |  2 +-
 tests/qemuxml2argvdata/cputune-numatune.args  |  2 +-
 .../qemuxml2argvdata/cputune-zero-shares.args |  2 +-
 tests/qemuxml2argvdata/cputune.args           |  2 +-
 .../default-kvm-host-arch.args                |  2 +-
 .../default-qemu-host-arch.args               |  2 +-
 .../fd-memory-no-numa-topology.args           |  2 +-
 .../fd-memory-numa-topology.args              |  2 +-
 .../fd-memory-numa-topology2.args             |  2 +-
 .../fd-memory-numa-topology3.args             |  2 +-
 .../firmware-manual-bios.args                 |  2 +-
 .../firmware-manual-efi-acpi-aarch64.args     |  2 +-
 .../firmware-manual-efi-acpi-q35.args         |  2 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |  2 +-
 .../firmware-manual-efi-secure.args           |  2 +-
 .../qemuxml2argvdata/firmware-manual-efi.args |  2 +-
 .../firmware-manual-noefi-acpi-q35.args       |  2 +-
 .../firmware-manual-noefi-noacpi-aarch64.args |  2 +-
 .../firmware-manual-noefi-noacpi-q35.args     |  2 +-
 .../hostdev-mdev-precreated.args              |  2 +-
 .../hostdev-pci-address-unassigned.args       |  2 +-
 .../hostdev-pci-multifunction.args            |  2 +-
 .../hostdev-scsi-vhost-scsi-ccw.args          |  2 +-
 .../hostdev-scsi-vhost-scsi-pci.args          |  2 +-
 .../hostdev-scsi-vhost-scsi-pcie.args         |  2 +-
 .../hostdev-subsys-mdev-vfio-ccw.args         |  2 +-
 .../hostdev-vfio-multidomain.args             |  2 +-
 .../hostdev-vfio-zpci-autogenerate-fids.args  |  2 +-
 .../hostdev-vfio-zpci-autogenerate-uids.args  |  2 +-
 .../hostdev-vfio-zpci-autogenerate.args       |  2 +-
 .../hostdev-vfio-zpci-boundaries.args         |  2 +-
 .../hostdev-vfio-zpci-ccw-memballoon.args     |  2 +-
 .../hostdev-vfio-zpci-multidomain-many.args   |  2 +-
 tests/qemuxml2argvdata/hostdev-vfio-zpci.args |  2 +-
 tests/qemuxml2argvdata/hostdev-vfio.args      |  2 +-
 tests/qemuxml2argvdata/hotplug-base.args      |  2 +-
 .../hugepages-default-2M.args                 |  2 +-
 .../hugepages-default-system-size.args        |  2 +-
 tests/qemuxml2argvdata/hugepages-default.args |  2 +-
 .../qemuxml2argvdata/hugepages-memaccess.args |  2 +-
 .../hugepages-memaccess2.args                 |  2 +-
 tests/qemuxml2argvdata/hugepages-nodeset.args |  2 +-
 .../hugepages-numa-default-2M.args            |  2 +-
 .../hugepages-numa-default-dimm.args          |  2 +-
 .../hugepages-numa-default.args               |  2 +-
 .../hugepages-numa-nodeset-part.args          |  2 +-
 .../hugepages-numa-nodeset.args               |  2 +-
 tests/qemuxml2argvdata/hugepages-shared.args  |  2 +-
 .../hvf-aarch64-virt-headless.args            |  2 +-
 .../hvf-x86_64-q35-headless.args              |  2 +-
 .../qemuxml2argvdata/input-usbmouse-addr.args |  2 +-
 tests/qemuxml2argvdata/input-usbmouse.args    |  2 +-
 tests/qemuxml2argvdata/input-usbtablet.args   |  2 +-
 tests/qemuxml2argvdata/input-virtio-ccw.args  |  2 +-
 .../iothreads-disk-virtio-ccw.args            |  2 +-
 tests/qemuxml2argvdata/iothreads-disk.args    |  2 +-
 .../iothreads-ids-partial.args                |  2 +-
 tests/qemuxml2argvdata/iothreads-ids.args     |  2 +-
 tests/qemuxml2argvdata/iothreads.args         |  2 +-
 tests/qemuxml2argvdata/kvm-features-off.args  |  2 +-
 tests/qemuxml2argvdata/kvm-features.args      |  2 +-
 tests/qemuxml2argvdata/kvm-pit-delay.args     |  2 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args   |  2 +-
 tests/qemuxml2argvdata/kvmclock.args          |  2 +-
 .../mach-virt-console-virtio.args             |  2 +-
 .../mach-virt-serial-native.args              |  2 +-
 .../mach-virt-serial-pci.args                 |  2 +-
 .../mach-virt-serial-usb.args                 |  2 +-
 .../machine-aeskeywrap-off-cap.args           |  2 +-
 .../machine-aeskeywrap-off-caps.args          |  2 +-
 .../machine-aeskeywrap-on-cap.args            |  2 +-
 .../machine-aeskeywrap-on-caps.args           |  2 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |  2 +-
 tests/qemuxml2argvdata/machine-aliases2.args  |  2 +-
 tests/qemuxml2argvdata/machine-core-off.args  |  2 +-
 tests/qemuxml2argvdata/machine-core-on.args   |  2 +-
 .../machine-deakeywrap-off-cap.args           |  2 +-
 .../machine-deakeywrap-off-caps.args          |  2 +-
 .../machine-deakeywrap-on-cap.args            |  2 +-
 .../machine-deakeywrap-on-caps.args           |  2 +-
 .../machine-keywrap-none-caps.args            |  2 +-
 .../machine-keywrap-none.args                 |  2 +-
 ...ine-loadparm-multiple-disks-nets-s390.args |  2 +-
 .../machine-loadparm-net-s390.args            |  2 +-
 .../machine-loadparm-s390.args                |  2 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |  2 +-
 tests/qemuxml2argvdata/master-key.args        |  2 +-
 .../memory-hotplug-dimm-addr.args             |  2 +-
 .../qemuxml2argvdata/memory-hotplug-dimm.args |  2 +-
 ...emory-hotplug-nvdimm-ppc64-abi-update.args |  2 +-
 .../memory-hotplug-nvdimm-ppc64.args          |  2 +-
 ...emory-hotplug-ppc64-nonuma-abi-update.args |  2 +-
 .../memory-hotplug-ppc64-nonuma.args          |  2 +-
 tests/qemuxml2argvdata/memory-hotplug.args    |  2 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |  2 +-
 tests/qemuxml2argvdata/memtune.args           |  2 +-
 .../migrate-numa-unaligned.args               |  2 +-
 tests/qemuxml2argvdata/migrate.args           |  2 +-
 tests/qemuxml2argvdata/minimal.args           |  2 +-
 tests/qemuxml2argvdata/misc-acpi.args         |  2 +-
 tests/qemuxml2argvdata/misc-disable-s3.args   |  2 +-
 .../misc-disable-suspends.args                |  2 +-
 tests/qemuxml2argvdata/misc-enable-s4.args    |  2 +-
 tests/qemuxml2argvdata/misc-uuid.args         |  2 +-
 tests/qemuxml2argvdata/monitor-json.args      |  2 +-
 .../multifunction-pci-device.args             |  2 +-
 tests/qemuxml2argvdata/net-client.args        |  2 +-
 tests/qemuxml2argvdata/net-eth-hostip.args    |  2 +-
 tests/qemuxml2argvdata/net-eth-ifname.args    |  2 +-
 tests/qemuxml2argvdata/net-eth-names.args     |  2 +-
 .../net-eth-unmanaged-tap.args                |  2 +-
 tests/qemuxml2argvdata/net-eth.args           |  2 +-
 .../net-hostdev-bootorder.args                |  2 +-
 .../net-hostdev-multidomain.args              |  2 +-
 .../net-hostdev-vfio-multidomain.args         |  2 +-
 tests/qemuxml2argvdata/net-hostdev-vfio.args  |  2 +-
 tests/qemuxml2argvdata/net-hostdev.args       |  2 +-
 tests/qemuxml2argvdata/net-many-models.args   |  2 +-
 tests/qemuxml2argvdata/net-mcast.args         |  2 +-
 tests/qemuxml2argvdata/net-server.args        |  2 +-
 tests/qemuxml2argvdata/net-udp.args           |  2 +-
 tests/qemuxml2argvdata/net-user-addr.args     |  2 +-
 tests/qemuxml2argvdata/net-user.args          |  2 +-
 .../net-vhostuser-multiq.args                 |  2 +-
 tests/qemuxml2argvdata/net-vhostuser.args     |  2 +-
 tests/qemuxml2argvdata/net-virtio-ccw.args    |  2 +-
 tests/qemuxml2argvdata/net-virtio-device.args |  2 +-
 .../net-virtio-disable-offloads.args          |  2 +-
 tests/qemuxml2argvdata/net-virtio-netdev.args |  2 +-
 .../net-virtio-rxtxqueuesize.args             |  2 +-
 .../net-virtio-teaming-hostdev.args           |  2 +-
 .../qemuxml2argvdata/net-virtio-teaming.args  |  2 +-
 tests/qemuxml2argvdata/net-virtio.args        |  2 +-
 tests/qemuxml2argvdata/nosharepages.args      |  2 +-
 .../numad-auto-memory-vcpu-cpuset.args        |  2 +-
 ...o-memory-vcpu-no-cpuset-and-placement.args |  2 +-
 .../numad-auto-vcpu-static-numatune.args      |  2 +-
 .../numad-static-memory-auto-vcpu.args        |  2 +-
 tests/qemuxml2argvdata/numad.args             |  2 +-
 .../numatune-auto-nodeset-invalid.args        |  2 +-
 .../numatune-auto-prefer.args                 |  2 +-
 .../qemuxml2argvdata/numatune-distances.args  |  2 +-
 .../numatune-memnode-no-memory.args           |  2 +-
 tests/qemuxml2argvdata/numatune-memnode.args  |  2 +-
 tests/qemuxml2argvdata/numatune-memory.args   |  2 +-
 tests/qemuxml2argvdata/numatune-no-vcpu.args  |  2 +-
 .../qemuxml2argvdata/pages-dimm-discard.args  |  2 +-
 .../pages-discard-hugepages.args              |  2 +-
 tests/qemuxml2argvdata/pages-discard.args     |  2 +-
 .../parallel-parport-chardev.args             |  2 +-
 .../parallel-tcp-chardev.args                 |  2 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |  2 +-
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |  2 +-
 tests/qemuxml2argvdata/pci-autofill-addr.args |  2 +-
 .../pci-bridge-many-disks.args                |  2 +-
 tests/qemuxml2argvdata/pci-bridge.args        |  4 +--
 tests/qemuxml2argvdata/pci-expander-bus.args  |  2 +-
 tests/qemuxml2argvdata/pci-many.args          |  2 +-
 tests/qemuxml2argvdata/pci-rom-disabled.args  |  2 +-
 tests/qemuxml2argvdata/pci-rom.args           |  2 +-
 .../pci-serial-dev-chardev.args               |  2 +-
 tests/qemuxml2argvdata/pcie-expander-bus.args |  2 +-
 .../pcie-root-port-model-generic.args         |  2 +-
 .../pcie-root-port-model-ioh3420.args         |  2 +-
 tests/qemuxml2argvdata/pcie-root-port.args    |  2 +-
 tests/qemuxml2argvdata/pcie-root.args         |  2 +-
 .../pcie-switch-downstream-port.args          |  2 +-
 .../pcie-switch-upstream-port.args            |  2 +-
 tests/qemuxml2argvdata/pcihole64-q35.args     |  2 +-
 tests/qemuxml2argvdata/pcihole64.args         |  2 +-
 tests/qemuxml2argvdata/pmu-feature-off.args   |  2 +-
 tests/qemuxml2argvdata/pmu-feature.args       |  2 +-
 tests/qemuxml2argvdata/ppc-dtb.args           |  2 +-
 .../ppc64-usb-controller-legacy.args          |  2 +-
 .../ppc64-usb-controller-qemu-xhci.args       |  2 +-
 .../ppc64-usb-controller.args                 |  2 +-
 tests/qemuxml2argvdata/ppce500-serial.args    |  2 +-
 tests/qemuxml2argvdata/pseries-basic.args     |  2 +-
 .../pseries-console-virtio.args               |  2 +-
 .../qemuxml2argvdata/pseries-cpu-compat.args  |  2 +-
 tests/qemuxml2argvdata/pseries-cpu-exact.args |  2 +-
 tests/qemuxml2argvdata/pseries-cpu-le.args    |  2 +-
 tests/qemuxml2argvdata/pseries-features.args  |  2 +-
 .../qemuxml2argvdata/pseries-hostdevs-1.args  |  2 +-
 .../qemuxml2argvdata/pseries-hostdevs-2.args  |  2 +-
 .../qemuxml2argvdata/pseries-hostdevs-3.args  |  2 +-
 .../pseries-many-buses-1.args                 |  2 +-
 .../pseries-many-buses-2.args                 |  2 +-
 .../pseries-many-devices.args                 |  2 +-
 tests/qemuxml2argvdata/pseries-nvram.args     |  2 +-
 .../pseries-panic-missing.args                |  2 +-
 .../pseries-panic-no-address.args             |  2 +-
 .../pseries-phb-default-missing.args          |  2 +-
 .../pseries-phb-numa-node.args                |  2 +-
 .../qemuxml2argvdata/pseries-phb-simple.args  |  2 +-
 .../pseries-serial-native.args                |  2 +-
 .../qemuxml2argvdata/pseries-serial-pci.args  |  2 +-
 .../qemuxml2argvdata/pseries-serial-usb.args  |  2 +-
 .../qemuxml2argvdata/pseries-usb-default.args |  2 +-
 tests/qemuxml2argvdata/pseries-usb-kbd.args   |  2 +-
 tests/qemuxml2argvdata/pseries-usb-multi.args |  2 +-
 .../pseries-vio-user-assigned.args            |  2 +-
 tests/qemuxml2argvdata/pseries-vio.args       |  2 +-
 .../q35-default-devices-only.args             |  2 +-
 tests/qemuxml2argvdata/q35-multifunction.args |  2 +-
 .../q35-pci-force-address.args                |  4 +--
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |  2 +-
 tests/qemuxml2argvdata/q35-pcie.args          |  2 +-
 .../q35-pm-disable-fallback.args              |  2 +-
 tests/qemuxml2argvdata/q35-pm-disable.args    |  2 +-
 tests/qemuxml2argvdata/q35-usb2-multi.args    |  2 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |  2 +-
 tests/qemuxml2argvdata/q35-usb2.args          |  2 +-
 .../q35-virt-manager-basic.args               |  4 +--
 tests/qemuxml2argvdata/q35-virtio-pci.args    |  2 +-
 tests/qemuxml2argvdata/q35.args               |  2 +-
 tests/qemuxml2argvdata/qemu-ns-alt.args       |  2 +-
 .../qemu-ns-commandline-ns0.args              |  2 +-
 .../qemu-ns-commandline-ns1.args              |  2 +-
 .../qemuxml2argvdata/qemu-ns-commandline.args |  2 +-
 .../qemu-ns-domain-commandline-ns0.args       |  2 +-
 .../qemu-ns-domain-commandline.args           |  2 +-
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |  2 +-
 tests/qemuxml2argvdata/qemu-ns-no-env.args    |  2 +-
 .../reboot-timeout-disabled.args              |  2 +-
 .../reboot-timeout-enabled.args               |  2 +-
 tests/qemuxml2argvdata/restore-v2-fd.args     |  2 +-
 tests/qemuxml2argvdata/restore-v2.args        |  2 +-
 tests/qemuxml2argvdata/riscv64-virt-pci.args  |  2 +-
 tests/qemuxml2argvdata/riscv64-virt.args      |  2 +-
 .../qemuxml2argvdata/s390-panic-missing.args  |  2 +-
 .../s390-panic-no-address.args                |  2 +-
 tests/qemuxml2argvdata/s390-serial-2.args     |  2 +-
 .../qemuxml2argvdata/s390-serial-console.args |  2 +-
 tests/qemuxml2argvdata/s390-serial.args       |  2 +-
 tests/qemuxml2argvdata/seclabel-dac-none.args |  2 +-
 .../seclabel-dynamic-baselabel.args           |  2 +-
 .../seclabel-dynamic-labelskip.args           |  2 +-
 .../seclabel-dynamic-override.args            |  2 +-
 .../seclabel-dynamic-relabel.args             |  2 +-
 tests/qemuxml2argvdata/seclabel-dynamic.args  |  2 +-
 tests/qemuxml2argvdata/seclabel-none.args     |  2 +-
 .../seclabel-static-labelskip.args            |  2 +-
 .../seclabel-static-relabel.args              |  2 +-
 tests/qemuxml2argvdata/seclabel-static.args   |  2 +-
 .../serial-dev-chardev-iobase.args            |  2 +-
 .../qemuxml2argvdata/serial-dev-chardev.args  |  2 +-
 .../qemuxml2argvdata/serial-file-chardev.args |  2 +-
 tests/qemuxml2argvdata/serial-file-log.args   |  2 +-
 .../qemuxml2argvdata/serial-many-chardev.args |  2 +-
 .../qemuxml2argvdata/serial-pty-chardev.args  |  2 +-
 tests/qemuxml2argvdata/serial-spiceport.args  |  2 +-
 .../qemuxml2argvdata/serial-tcp-chardev.args  |  2 +-
 .../serial-tcp-telnet-chardev.args            |  2 +-
 .../serial-tcp-tlsx509-chardev-notls.args     |  2 +-
 .../serial-tcp-tlsx509-chardev-verify.args    |  2 +-
 .../serial-tcp-tlsx509-chardev.args           |  2 +-
 .../serial-tcp-tlsx509-secret-chardev.args    |  2 +-
 .../qemuxml2argvdata/serial-udp-chardev.args  |  2 +-
 .../qemuxml2argvdata/serial-unix-chardev.args |  2 +-
 tests/qemuxml2argvdata/serial-vc-chardev.args |  2 +-
 .../shmem-plain-doorbell.args                 |  2 +-
 tests/qemuxml2argvdata/shmem.args             |  2 +-
 .../smartcard-controller.args                 |  2 +-
 .../smartcard-host-certificates-database.args |  2 +-
 .../smartcard-host-certificates.args          |  2 +-
 tests/qemuxml2argvdata/smartcard-host.args    |  2 +-
 .../smartcard-passthrough-spicevmc.args       |  2 +-
 .../smartcard-passthrough-tcp.args            |  2 +-
 tests/qemuxml2argvdata/smbios-type-fwcfg.args |  2 +-
 tests/qemuxml2argvdata/smbios.args            |  2 +-
 tests/qemuxml2argvdata/smp-dies.args          |  2 +-
 tests/qemuxml2argvdata/smp.args               |  2 +-
 tests/qemuxml2argvdata/sound-device.args      | 26 ++++++++---------
 tests/qemuxml2argvdata/sound.args             |  8 ++---
 tests/qemuxml2argvdata/sparc-minimal.args     |  2 +-
 .../usb-controller-default-q35.args           |  2 +-
 .../usb-controller-explicit-q35.args          |  2 +-
 .../usb-controller-qemu-xhci.args             |  2 +-
 .../qemuxml2argvdata/usb-controller-xhci.args |  2 +-
 tests/qemuxml2argvdata/usb-controller.args    |  2 +-
 .../usb-hub-autoadd-deluxe.args               |  2 +-
 tests/qemuxml2argvdata/usb-hub-autoadd.args   |  2 +-
 tests/qemuxml2argvdata/usb-hub.args           |  2 +-
 .../qemuxml2argvdata/usb-ich9-autoassign.args |  2 +-
 .../qemuxml2argvdata/usb-ich9-companion.args  |  2 +-
 .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |  2 +-
 .../qemuxml2argvdata/usb-long-port-path.args  |  2 +-
 tests/qemuxml2argvdata/usb-none.args          |  2 +-
 .../usb-piix3-controller.args                 |  2 +-
 .../qemuxml2argvdata/usb-port-autoassign.args |  2 +-
 tests/qemuxml2argvdata/usb-port-missing.args  |  2 +-
 tests/qemuxml2argvdata/usb-ports.args         |  2 +-
 tests/qemuxml2argvdata/usb-redir-boot.args    |  2 +-
 .../usb-redir-filter-version.args             |  2 +-
 tests/qemuxml2argvdata/usb-redir-filter.args  |  2 +-
 tests/qemuxml2argvdata/usb-redir.args         |  2 +-
 .../qemuxml2argvdata/usb-xhci-autoassign.args |  2 +-
 tests/qemuxml2argvdata/usb1-usb2.args         |  2 +-
 tests/qemuxml2argvdata/user-aliases-usb.args  |  2 +-
 tests/qemuxml2argvdata/user-aliases.args      |  6 ++--
 .../vcpu-placement-static.args                |  2 +-
 .../video-device-pciaddr-default.args         |  4 +--
 tests/qemuxml2argvdata/video-none-device.args |  4 +--
 .../video-qxl-device-vgamem.args              |  2 +-
 tests/qemuxml2argvdata/video-qxl-device.args  |  2 +-
 tests/qemuxml2argvdata/video-qxl-heads.args   |  2 +-
 tests/qemuxml2argvdata/video-qxl-noheads.args |  2 +-
 .../video-qxl-resolution.args                 |  2 +-
 .../video-qxl-sec-device-vgamem.args          |  2 +-
 .../video-qxl-sec-device.args                 |  2 +-
 .../video-vga-device-vgamem.args              |  2 +-
 tests/qemuxml2argvdata/video-vga-device.args  |  2 +-
 .../qemuxml2argvdata/video-vga-qxl-heads.args |  2 +-
 .../video-virtio-gpu-ccw.args                 |  4 +--
 .../video-virtio-gpu-device.args              |  2 +-
 .../video-virtio-gpu-secondary.args           |  2 +-
 .../video-virtio-gpu-spice-gl.args            |  2 +-
 .../video-virtio-gpu-virgl.args               |  2 +-
 tests/qemuxml2argvdata/video-virtio-vga.args  |  2 +-
 .../virtio-input-passthrough.args             |  2 +-
 tests/qemuxml2argvdata/virtio-input.args      |  2 +-
 tests/qemuxml2argvdata/virtio-rng-ccw.args    |  2 +-
 .../qemuxml2argvdata/virtio-rng-default.args  |  2 +-
 tests/qemuxml2argvdata/virtio-rng-egd.args    |  2 +-
 .../qemuxml2argvdata/virtio-rng-multiple.args |  2 +-
 tests/qemuxml2argvdata/virtio-rng-random.args |  2 +-
 tests/qemuxml2argvdata/vmcoreinfo.args        |  2 +-
 444 files changed, 480 insertions(+), 487 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 262fffe5fe..4d9a0eb2e1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4692,8 +4692,7 @@ qemuBuildSoundDevCmd(virCommand *cmd,
         return -1;
     }

-    if (!virDomainSoundModelSupportsCodecs(sound) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
+    if (!virDomainSoundModelSupportsCodecs(sound)) {
         if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
             return -1;
     }
@@ -4727,10 +4726,8 @@ qemuBuildSoundCodecCmd(virCommand *cmd,
     g_autofree char *alias = g_strdup_printf("%s-codec%d", sound->info.alias, codec->cad);
     g_autofree char *bus = g_strdup_printf("%s.0", sound->info.alias);

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-        if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
-            return -1;
-    }
+    if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
+        return -1;

     if (virJSONValueObjectAdd(&props,
                               "s:driver", qemuSoundCodecTypeToString(codec->type),
@@ -8118,7 +8115,7 @@ qemuBuildAudioPulseAudioEnv(virCommand *cmd,
 }


-static int
+static int G_GNUC_UNUSED
 qemuBuildAudioCommandLineEnv(virCommand *cmd,
                              virDomainDef *def)
 {
@@ -8220,12 +8217,9 @@ qemuBuildAudioCommandLineEnv(virCommand *cmd,
 static int
 qemuBuildAudioCommandLine(virCommand *cmd,
                           virDomainDef *def,
-                          virQEMUCaps *qemuCaps)
+                          virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 {
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV))
-        return qemuBuildAudioCommandLineArgs(cmd, def);
-    else
-        return qemuBuildAudioCommandLineEnv(cmd, def);
+    return qemuBuildAudioCommandLineArgs(cmd, def);
 }


@@ -8264,10 +8258,14 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
                                 virQEMUCaps *qemuCaps,
                                 virDomainGraphicsDef *graphics)
 {
+    g_autofree char *audioid = qemuGetAudioIDString(def, graphics->data.vnc.audioId);
     g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
     virDomainGraphicsListenDef *glisten = NULL;
     bool escapeAddr;

+    if (!audioid)
+        return -1;
+
     if (!(glisten = virDomainGraphicsGetListen(graphics, 0))) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("missing listen element"));
@@ -8361,12 +8359,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
                           "on" : "off");
     }

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-        g_autofree char *audioid = qemuGetAudioIDString(def, graphics->data.vnc.audioId);
-        if (!audioid)
-            return -1;
-        virBufferAsprintf(&opt, ",audiodev=%s", audioid);
-    }
+    virBufferAsprintf(&opt, ",audiodev=%s", audioid);

     virCommandAddArg(cmd, "-vnc");
     virCommandAddArgBuffer(cmd, &opt);
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index f41907ce2b..23edbd4edb 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -38,6 +37,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-device,id=balloon0 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index b22f8b1de4..6a9898193f 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args
index a064d52b7d..5f78b398fc 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 48c856f517..483343b975 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 43e142372d..9cb4aa4b3b 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index 2cc39ab3b5..56dc20bd0f 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index 000346d64b..6ac50d6f17 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
 -name guest=armtest,debug-threads=on \
 -S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 89dee4243e..06f6f0227a 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -add-fd set=0,fd=1751,opaque=serial0-log \
 -chardev pty,id=charserial0,logfile=/dev/fdset/0,logappend=on \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 939e938231..fff5021883 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device pcie-root-port,port=9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
 -chardev pty,id=charserial0 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index fbb40f8529..4c4e59ba7e 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -6,7 +6,6 @@ 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-aarch64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index f7deb39419..32cfdff45b 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -6,7 +6,6 @@ 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-aarch64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device qemu-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
index 19050eb340..24fddcf520 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64-vgpu,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device ioh3420,port=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
--vnc 127.0.0.1:0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.2,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index ce9144c820..7c710b7c33 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64-vgpu,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,multifunction=on,addr=0x1.0x1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:73:34:53,bootindex=1,bus=pci.1,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.2,addr=0x0 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index ac5cf85c85..7f8bd9d402 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -43,6 +42,7 @@ QEMU_AUDIO_DRV=none \
 -serial chardev:charserial0 \
 -chardev pty,id=charconsole1 \
 -device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x4 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.2,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 229c2fca89..9fc886d721 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-virt-default/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-virt-default/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-virt-default/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64-virt-default-nic,debug-threads=on \
 -S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -append console=ttyAMA0 \
 -netdev user,id=hostnet0 \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index c20f80928c..4a78ab1038 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -40,6 +39,7 @@ QEMU_AUDIO_DRV=none \
 -serial chardev:charserial0 \
 -chardev pty,id=charconsole1 \
 -device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-device,id=balloon0 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 4c63049723..2e2b523b07 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -46,6 +45,7 @@ QEMU_AUDIO_DRV=none \
 -serial chardev:charserial0 \
 -chardev pty,id=charconsole1 \
 -device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 4951a60cd0..671854a250 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -41,4 +40,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,addr=0x2 \
 -netdev user,id=hostnet1 \
 -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:09:a4:38,bus=pci.2,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args
index 169fa61e1f..996dfac7b0 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index 19750162c2..b175c67dcd 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
 -name guest=armtest,debug-threads=on \
 -S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
 -net nic,macaddr=52:54:00:09:a4:37,netdev=hostnet0,model=lan9118,id=net0 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index 5ef4e45766..f9638c5c80 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
 -name guest=armtest,debug-threads=on \
 -S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -append console=ttyAMA0,115200n8 \
 -dtb /arm.dtb \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 99580fa0d3..c8fd7ec981 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
 -name guest=armtest,debug-threads=on \
 -S \
@@ -39,6 +38,7 @@ QEMU_AUDIO_DRV=none \
 -serial chardev:charserial0 \
 -chardev pty,id=charconsole1 \
 -device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-device,id=balloon0 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 909d2caaf9..fb0bf0e374 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
 -name guest=armtest,debug-threads=on \
 -S \
@@ -38,6 +37,7 @@ QEMU_AUDIO_DRV=none \
 -serial chardev:charserial0 \
 -chardev pty,id=charconsole1 \
 -device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-device,id=balloon0 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.args
index 16b9646654..f64c20ce3c 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -6,7 +6,6 @@ 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=sdl \
 SDL_AUDIODRIVER=esd \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
@@ -29,6 +28,7 @@ SDL_AUDIODRIVER=esd \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"sdl"}' \
 -display sdl \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.args
index a09070590a..2b6946e99a 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=spice \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.args
index 68090930d8..862bde252f 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -6,7 +6,6 @@ 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=alsa \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=alsa \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
--vnc 127.0.0.1:0 \
+-audiodev '{"id":"audio1","driver":"alsa"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
index 85bb41e5b8..08a496c9b7 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -57,4 +56,5 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-ehci1,id=usb4,bus=pci.2,addr=0x2.0x7 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 45fecc17b8..558fd23a06 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,5 +24,6 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,deflate-on-oom=on,devno=fe.0.000a \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index c4deb228b3..de5a740a5c 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,deflate-on-oom=off,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 6b4d8742ce..060e1fc617 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,deflate-on-oom=on,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
index a56b89a980..7ca265fd15 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
index a56b89a980..7ca265fd15 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 6837a3e578..78b52d8389 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=aarch64test,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -initrd /aarch64.initrd \
 -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
 -dtb /aarch64.dtb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-device,id=balloon0,deflate-on-oom=on \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index 57113954e0..59095372f5 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index bee8a4cc74..bf97a62e1b 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -6,7 +6,6 @@ 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 \
@@ -46,4 +45,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bootindex=2,bus=pci.0,addr=0x2 \
 -netdev user,id=hostnet1 \
 -device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 079d660d92..632664c46b 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
 -device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index 132a8a1105..b449214b7f 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
 -global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 43237975da..3538921f0e 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index 43237975da..3538921f0e 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index c634edde42..4a799dfe10 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index 882046b3a0..5b5cf2c559 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index 882046b3a0..5b5cf2c559 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/cdrom,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,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index 680b276300..30369ad55e 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index 613b322310..241639546f 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -6,7 +6,6 @@ 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 \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
 -global isa-fdc.bootindexB=4 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bootindex=2,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index fcd063fc2c..52411f9289 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pipe,id=charchannel0,path=/tmp/guestfwd \
 -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index 45af2ac258..0671ae2660 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -31,6 +30,7 @@ QEMU_AUDIO_DRV=spice \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 72a1a38bd6..311860cc67 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -6,7 +6,6 @@ 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 \
@@ -44,5 +43,6 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
 -chardev pty,id=charchannel5 \
 -device virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index a1e7f70467..e78c7a758b 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -6,7 +6,6 @@ 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 \
@@ -43,5 +42,6 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
 -chardev pty,id=charchannel5 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 528c8309bc..5974937da3 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -6,7 +6,6 @@ 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 \
@@ -43,5 +42,6 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh \
 -chardev pty,id=charchannel5 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index b4e22e6c6b..278ce4b731 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -34,6 +33,7 @@ QEMU_AUDIO_DRV=spice \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \
 -chardev spicevmc,id=charchannel1,name=vdagent \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index bb3ee46aa5..ea49528e02 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -6,7 +6,6 @@ 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 \
@@ -36,5 +35,6 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial1.0,nr=4,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo1 \
 -chardev pty,id=charchannel2 \
 -device virtserialport,bus=virtio-serial1.0,nr=5,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.foo2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 5b36bf921b..45a102bbac 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -6,7 +6,6 @@ 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 \
@@ -39,4 +38,5 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,name=ble \
 -chardev socket,id=charchannel3,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,id=channel3,name=fdsa \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index 34ea509d0a..c96c019b6c 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
index e184ee1879..87b7feabc5 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -6,7 +6,6 @@ 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 \
@@ -36,6 +35,7 @@ QEMU_AUDIO_DRV=none \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=asdf \
 -chardev socket,id=charchannel1,path=/tmp/channel/fdsa,reconnect=0 \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=fdsa \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -chardev socket,id=charredir0,host=localhost,port=3456,reconnect=15 \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
 -chardev socket,id=charrng0,host=localhost,port=2345,reconnect=5 \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index a342d82f66..0ec9e70f22 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index 0094082533..a5a8f3a088 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -7,7 +7,6 @@ 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 \
 TZ=Europe/Paris \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index ec0a34fed8..1979882c36 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 433037ae31..3a03f782c0 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
index 4fba3aa9cd..7cd450c9be 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2argvdata/clock-realtime.args
index 63c983f023..4b9321552f 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 0505bfcaf3..dcef2edda3 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
index b5f235f530..39bc2c0a6e 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index 6dd7483a5a..9d03ac30ff 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index 30d6d5545c..cf08357b27 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index 30d6d5545c..cf08357b27 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 66c2224d6e..7013b6b570 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
index ba897d7ba5..a663029542 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index 0fd92ac96a..534d75fbee 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -6,7 +6,6 @@ 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 \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
 -device virtconsole,chardev=charconsole2,id=console2 \
 -chardev pty,id=charconsole3 \
 -device virtconsole,chardev=charconsole3,id=console3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index 7498dac2f8..c11c01ed2f 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args
index 8cfe69206e..9fcc9560f6 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fdr/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fdr/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \
-QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fdr,debug-threads=on \
 -S \
@@ -41,10 +40,11 @@ QEMU_AUDIO_DRV=spice \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1.2 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index da0493037a..560d845240 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
index f459b38629..0db0ef998e 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args
index 1cf23a883f..6bbcb68acb 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args
index 401daa8ab2..4c6b79bd49 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args
index a8cc26577a..a4475fa592 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 9df5eee09b..f56551df79 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index d71cb3158f..d82582f66d 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index eca256ece7..af7d0d6ae3 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index dabf914768..22de341498 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index 0aed025962..451643b43f 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args
index 7e56f1d584..bdcc09d7ac 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 7f11de3f59..96cba2a377 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index f1cccef206..e5da3d93cf 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index 838ddfca7e..01c96a8382 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args
index 838ddfca7e..01c96a8382 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args
index 8bd42174f8..aa9aec3f12 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 343d98c194..134547d3b9 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args
index 343d98c194..134547d3b9 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
index fb9a5e0b92..7aab132fb7 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 679659a4a9..88b7d9ed0e 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 723315d636..2fe3594248 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index 9a6c527b28..143b663679 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index f091d6fe9d..5e489f3647 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args
index c0603e1d5c..5360947e3d 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 8f1991eceb..56597bafdf 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 7e56f1d584..bdcc09d7ac 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index 419e8df7c2..8f873405f5 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
index 260481b4d2..4093e2579b 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
index 5ea11420a6..9aa70f0ae4 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args
index fe9aa6e9ef..8096c7092b 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index 838ddfca7e..01c96a8382 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index 491aa46dc4..c7a4067ba9 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 0a57a591f5..4d359b0389 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index fef06295f3..a2895fd136 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args
index fef06295f3..a2895fd136 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args
index fef06295f3..a2895fd136 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.args
index 65071a6dd7..6935e7fcbb 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-guest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest1/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
 -name guest=guest1,debug-threads=on \
 -S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index a07864750c..401d794c0f 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-guest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest1/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
 -name guest=guest1,debug-threads=on \
 -S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args
index 693a97bf1f..e3a02dfec9 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args
index 762dba1fb1..997b081067 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args
index 91a5e52240..1c81a5d558 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args
index 762dba1fb1..997b081067 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index 14a88139bf..88266e8281 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args
index c61d93067f..dbadcb9ec5 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=dummy2,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 31f9c7b6da..9fcef59b7e 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-kvm/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=kvm,debug-threads=on \
 -S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index 8fa501dd99..1e9878be2f 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-qemu-host/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-qemu-host/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-qemu-host/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=qemu-host,debug-threads=on \
 -S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index 7067024402..048da754c5 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=instance-00000092,debug-threads=on \
 -S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index c857f96a0b..39f05c28d7 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=instance-00000092,debug-threads=on \
 -S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index 506291be24..9d8866d914 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=instance-00000092,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index aacfa63e41..39ab4e0f2d 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=instance-00000092,debug-threads=on \
 -S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.args b/tests/qemuxml2argvdata/firmware-manual-bios.args
index e1cb064b71..4f2ac0c682 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=test-bios,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
index ef98c940f7..3ff17a498e 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
index 0c5e3413c3..776f9fb467 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
index f3aa947e52..a0dcc22db2 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
index fe0f78599b..94ee0e48c0 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=test-bios,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.args b/tests/qemuxml2argvdata/firmware-manual-efi.args
index ac5f86dc83..8fb23cc1e6 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=test-bios,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
index d97ac2f634..b1c54a66e3 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
@@ -6,7 +6,6 @@ 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 \
@@ -25,4 +24,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
index 293085b105..7efdf3c17f 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
@@ -6,7 +6,6 @@ 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 \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
index c5e067853e..d0c35d1ef7 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
@@ -6,7 +6,6 @@ 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 \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 2ee9d246bb..fb11171ed5 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index b60c0a8930..06baf15bf1 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-delete/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-delete/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-delete/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=delete,debug-threads=on \
 -S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
 -device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x3 \
 -device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 5cb7d5e722..40e27373b6 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-delete/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-delete/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-delete/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=delete,debug-threads=on \
 -S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
 -device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x3 \
 -device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 56e4238d1c..fa3ef73d7b 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vhost-scsi-ccw,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,devno=fe.0.0002 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0003 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 10828ecb49..d322962660 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -30,6 +29,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index a296367a11..098404ec3a 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
 -device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.1,addr=0x0 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 20ed633390..59e17b65fd 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-ccw,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/90c6c135-ad44-41d0-b1b7-bae47de48627,devno=fe.0.0000 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index 141c960785..eb113edeeb 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
index 0e99410315..0b9cca797d 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
 -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
 -device zpci,uid=5,fid=1,target=hostdev1,id=zpci5 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
index b8d17fd765..da7a684394 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
 -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
 -device zpci,uid=2,fid=31,target=hostdev1,id=zpci2 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index 2fd50e6275..44c7416881 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
 -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
 -device zpci,uid=2,fid=1,target=balloon0,id=zpci2 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index 4011f99bbb..62b2472959 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -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 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
index fbf2cf4c9c..95ab50cb92 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-KVMGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-KVMGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-KVMGuest1/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
 -name guest=KVMGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
 -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index 499b55a2b5..8761df3267 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -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 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index c4ee9e211f..9df47029be 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device zpci,uid=25,fid=31,target=hostdev0,id=zpci25 \
 -device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x8 \
 -device zpci,uid=1,fid=0,target=balloon0,id=zpci1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
index 0928d2c05b..fcdf5f8aeb 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args
index 34e4fbc11a..0467c76c55 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-hotplug/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-hotplug/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-hotplug/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=hotplug,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
index c31dca0eab..55aa0e8f52 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=SomeDummyHugepagesGuest,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index 1e15f36c3b..ba2fcb6d67 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=SomeDummyHugepagesGuest,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args
index 1a9dacc7fd..9bfb277454 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 58ca7a73a0..03f6c3fc4f 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -6,7 +6,6 @@ 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 \
@@ -39,5 +38,6 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 675f7af92c..f35001d39f 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -6,7 +6,6 @@ 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 \
@@ -39,5 +38,6 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args
index c31dca0eab..55aa0e8f52 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=SomeDummyHugepagesGuest,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index 6cce82feaf..75c0e8e7ca 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=SomeDummyHugepagesGuest,debug-threads=on \
 -S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index 1c2fb4d1af..0cde2b06d3 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fedora,debug-threads=on \
 -S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
index e13c3f54c9..ea1766ab2f 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fedora,debug-threads=on \
 -S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index 13143db59b..5af3aa370e 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=SomeDummyHugepagesGuest,debug-threads=on \
 -S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index ca59b1bbd8..89018d92a2 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -6,7 +6,6 @@ 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 \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
index 0462327cf1..37f9ae9efa 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -6,7 +6,6 @@ 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 \
@@ -37,5 +36,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
index 3c7747ee51..5de677d678 100644
--- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
 -name guest=test,debug-threads=on \
 -S \
@@ -42,6 +41,7 @@ QEMU_AUDIO_DRV=none \
 -serial chardev:charserial0 \
 -chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
index 859d3a923d..a9b30271d4 100644
--- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=test,debug-threads=on \
 -S \
@@ -41,6 +40,7 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index bcd048d917..286582b06d 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -device usb-mouse,id=input0,bus=usb.0,port=2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
index 4f7a844a74..f13ac6625a 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -device usb-mouse,id=input0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
index 8b72174cee..53df43196d 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 0d980cbfba..a99eca6353 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-keyboard-ccw,id=input0,devno=fe.0.0002 \
 -device virtio-mouse-ccw,id=input1,devno=fe.0.0003 \
 -device virtio-tablet-ccw,id=input2,devno=fe.0.0004 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 32ae662b14..4a487475d6 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
 -device virtio-blk-ccw,iothread=iothread2,devno=0.0.0007,drive=drive-virtio-disk1,id=virtio-disk1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
index a8d27bf01e..8a4109872e 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -6,7 +6,6 @@ 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 \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
 -drive file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,id=drive-virtio-disk2 \
 -device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index b5dbc8694b..5eadf315db 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,4 +32,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
index 52e28727d3..f591475f10 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args
index a72be41a3d..e6e6e2b99b 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
index e14cc44b5b..6c878f5bc5 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
index 9c0a56d361..3ff3cc85a4 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
index 09e8d5ec3b..f8cc371367 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
index c8e25b07ad..e9cc6a7576 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 537466067c..e038c038eb 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index ad3ea235ae..f433f14ff7 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-device,id=virtio-serial0 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index a5f60e10b2..7fc8cfa300 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 3f6f66bd0a..dbd45881fa 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device pcie-root-port,port=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
 -chardev pty,id=charserial0 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index 7b65f5bbbc..892aac76b8 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
 -chardev pty,id=charserial0 \
 -device usb-serial,chardev=charserial0,id=serial0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index 276edec05b..cdaa726832 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index 276edec05b..cdaa726832 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 373deaed52..7987b3ed22 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 373deaed52..7987b3ed22 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
index 038b660afe..c9f0f917a7 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
index 8b87006b0b..670a622d1c 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
index b5f235f530..39bc2c0a6e 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
index 4c3cbb1117..1ff7a360fa 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 55db1edc3f..77b3be6d58 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 55db1edc3f..77b3be6d58 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index 3617cdccac..bd2632e2b6 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index 3617cdccac..bd2632e2b6 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index c107313e88..83fd401afa 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args
index c107313e88..83fd401afa 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index 36abcb8b07..d544f88a17 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,bootindex=2,devno=fe.0.0000 \
 -netdev user,id=hostnet1 \
 -device virtio-net-ccw,netdev=hostnet1,id=net1,mac=00:11:22:33:42:36,devno=fe.0.0004 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 0df3227913..c93796967d 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -netdev user,id=hostnet0 \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,bootindex=1,devno=fe.0.0000 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index db65ad22ad..d6a7b8faa5 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index c95c972803..8b411a83d2 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args
index b51cdc129e..aea6e71c84 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 110b1a32b7..00d3180c73 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 3f149ecace..c4497f5040 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index 8c19c1ed3a..028145e1e8 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \
 -device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index 8c19c1ed3a..028145e1e8 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984 \
 -device nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
index 25ae1f55dd..79b01fecfb 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \
 -object memory-backend-ram,id=memdimm1,size=536870912 \
 -device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index f6d0b3dd6c..f509fe0581 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \
 -object memory-backend-ram,id=memdimm1,size=536870912 \
 -device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
index 4557f99437..d4e717e8f9 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 9a60c80f36..b50d93a12f 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest,debug-threads=on \
 -S \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -incoming fd:7 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 5050ab76bc..4f67bef4ce 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -incoming tcp:10.0.0.1:5000 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
index ce0b66e43c..052243cd9d 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
index 874635aa41..77729307bd 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 7df458b259..656922aa3e 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
index 9b3209340b..579d508a49 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
index ce0b66e43c..052243cd9d 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
index b10eb8d5ea..65e9e5db26 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=encryptdisk,debug-threads=on \
 -S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/dev/hda1,format=qcow2,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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 4991ab3b6c..22f782a1f3 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
 -device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
index bdee6a691f..4ae01d8b59 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,connect=192.168.0.1:5558,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
index 587c40dc61..517c7d0144 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
index 587c40dc61..517c7d0144 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
index 325e316d7f..b639329316 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -netdev tap,fd=3,id=hostnet1 \
 -device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 5909d60490..90d9e23b31 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,vhost=on,vhostfd=44,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 587c40dc61..517c7d0144 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 450cd9c0b8..7467c91cd1 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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=2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index a2805dfcbb..1dfe67a8d9 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index aba9a4a6ed..247a7dd790 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index c3dc1a5aba..d6ef6cc3da 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
index 2e2e2f4639..6bbb88307a 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
index 3e128003f3..1753f328f0 100644
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -6,7 +6,6 @@ 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 \
@@ -38,4 +37,5 @@ QEMU_AUDIO_DRV=none \
 -device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
 -netdev user,id=hostnet5 \
 -device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
index ceb27541e7..bd8c3b07f8 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
index 8a304b913b..32d17e11d0 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,listen=192.168.0.1:5558,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 5cee8250f8..2100c0379d 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
index 9bc2e554da..c71817ee53 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,net=172.17.2.0/24,ipv6-prefix=2001:db8:ac10:fd01::,ipv6-prefixlen=64,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index aef00e219b..993e9a39d4 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 2160756488..d56a52f88e 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -6,7 +6,6 @@ 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 \
@@ -43,4 +42,5 @@ QEMU_AUDIO_DRV=none \
 -chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \
 -netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \
 -device virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x6 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
index 877ae58c8f..b804f29d58 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -6,7 +6,6 @@ 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 \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3 \
 -netdev socket,listen=:2015,id=hostnet2 \
 -device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 0294aa8e31..f7cc0a8e7a 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \
 -netdev user,id=hostnet1 \
 -device virtio-net-ccw,netdev=hostnet1,id=net1,mac=00:11:22:33:44:54,devno=fe.0.0000 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
index dc13103f4a..0f7f959a86 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index c9cd8badaf..c0e690254c 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 99dc72d2ae..768e59f5c6 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index e0e7a3345b..94849c71e6 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index f9a96a1bc0..93a7dc7037 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x5 \
 -device vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x6 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 9aeab9f49f..9c6fb3b4e1 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -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=0x3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x4 \
 -device vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x5 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
index 224f9f34c0..463d2cbf2f 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
index 83e11b91ed..4a448f0d7b 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 85180f80f1..13e92198e1 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
index 40fa6c9e65..cdcc83dc9c 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest,debug-threads=on \
 -S \
@@ -68,5 +67,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index f2818fb668..380f813932 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
index 2ba762f116..1564a0ddd6 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest,debug-threads=on \
 -S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args b/tests/qemuxml2argvdata/numatune-no-vcpu.args
index 29cc424142..4c36544b4e 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest,debug-threads=on \
 -S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
index ca6016077a..7f2cfa4234 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fedora,debug-threads=on \
 -S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
 -object memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912 \
 -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index 6cce82feaf..75c0e8e7ca 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=SomeDummyHugepagesGuest,debug-threads=on \
 -S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
index 244e7bb820..b7d2731755 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index a0c12ce004..98d424d7b3 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev parport,id=charparallel0,path=/dev/parport0 \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index 8730d2b59d..2066f97afb 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 676286bb79..d3b4e9cf6f 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fdr-br,debug-threads=on \
 -S \
@@ -35,6 +34,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index f7ea57c347..dbb7382918 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fdr-br,debug-threads=on \
 -S \
@@ -36,6 +35,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 856a78aeb7..98ae53988e 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fdr-br,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,readonly=on \
 -device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 9fdb261fb8..c6b8e73a18 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-lots-of-disks/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-lots-of-disks/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-lots-of-disks/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=lots-of-disks,debug-threads=on \
 -S \
@@ -240,4 +239,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk678,id=virtio-disk678 \
 -drive file=/var/lib/libvirt/images/disk-z-d.img,format=raw,if=none,id=drive-virtio-disk679 \
 -device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk679,id=virtio-disk679 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index 69d048cee1..c25780ab64 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fdr-br,debug-threads=on \
 -S \
@@ -93,7 +92,8 @@ QEMU_AUDIO_DRV=none \
 -device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x5 \
 -netdev user,id=hostnet31 \
 -device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \
--vnc 127.0.0.1:0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -k en-us \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
index 9a9a18dad9..14e330ed56 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-expander-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-expander-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-expander-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=expander-test,debug-threads=on \
 -S \
@@ -94,5 +93,6 @@ QEMU_AUDIO_DRV=none \
 -device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x3 \
 -netdev user,id=hostnet31 \
 -device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x4 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 3dc932d089..8293f0ba02 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=fdr-br,debug-threads=on \
 -S \
@@ -84,6 +83,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \
 -drive file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
 -device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 8095fb55dd..a1d89c944f 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,romfile= \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index e0b2da5409..b1cdec3d1d 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest2,debug-threads=on \
 -S \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,rombar=1 \
 -netdev user,id=hostnet1 \
 -device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x3,romfile=/etc/fake/bootrom.bin \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x4,rombar=0 \
 -device vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x5,rombar=1,romfile=/etc/fake/bootrom.bin \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index d1abb8a125..ecc02d35df 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
index 4661862d25..c4f59dd934 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=pcie-expander-bus-test,debug-threads=on \
 -S \
@@ -129,4 +128,5 @@ QEMU_AUDIO_DRV=none \
 -device e1000,netdev=hostnet30,id=net30,mac=52:54:00:7e:6e:c8,bus=pci.34,addr=0x0 \
 -netdev user,id=hostnet31 \
 -device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6d:c9,bus=pci.35,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 9b70394ac6..62c0bf982e 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
 -device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
 -device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index cf7ad03a52..0247c87166 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device ioh3420,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
 -device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
index bf22b1aa14..64469264b0 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=26,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args
index 9e505f3b18..06a31506f8 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 48f3442b8b..228af19fa4 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
 -device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 2bdfda97fa..71970f91d1 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
index 86ff17a6d7..77685e127e 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -global q35-pcihost.pci-hole64-size=1048576K \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
index 859bee2afc..343e5b58b8 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=foo,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -global i440FX-pcihost.pci-hole64-size=1048576K \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args
index efd0747eac..b3fa26b231 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args
index 298e962f53..911c3c54a5 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index abb8732029..951edcda6b 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -6,7 +6,6 @@ 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-ppc \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index a0c4f2eec0..bf1b1f368a 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index 57f2ae4871..e5b05a2e9e 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index d381d7f5cd..58d876bcd5 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args b/tests/qemuxml2argvdata/ppce500-serial.args
index ae67a0c752..1698f50498 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -6,7 +6,6 @@ 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-ppc \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argvdata/pseries-basic.args
index 64dc188718..67f927a1fa 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 4d68c70e78..2e9d1bd831 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 232fcf27e5..5e35726566 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 83c051e2e5..6059c5a31c 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2argvdata/pseries-cpu-le.args
index 12d1c277d9..667264ac82 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
index 5452a57bb0..2398f4cf0a 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -25,4 +24,5 @@ QEMU_AUDIO_DRV=none \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 074ec68bdf..3339187420 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device spapr-pci-host-bridge,index=1,id=pci.1 \
 -device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.1.0,addr=0x1 \
 -device vfio-pci,host=0001:01:00.0,id=hostdev1,bus=pci.2.0,addr=0x1 \
 -device vfio-pci,host=0001:01:00.1,id=hostdev2,bus=pci.2.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index a07a175f40..fca68ff76a 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=none \
 -device spapr-pci-host-bridge,index=1,id=pci.1 \
 -device spapr-pci-host-bridge,index=2,id=pci.2 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.1.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0001:01:00.0,id=hostdev0,bus=pci.1.0,addr=0x2 \
 -device vfio-pci,host=0005:90:01.0,id=hostdev1,bus=pci.2.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index ae8a32e0ec..c236d0b38f 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device spapr-pci-host-bridge,index=1,id=pci.1 \
 -device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0001:01:00.0,id=hostdev0,bus=pci.2.0,addr=0x1 \
 -device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.2.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index eb7a763094..bbb7c90707 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device spapr-pci-host-bridge,index=1,id=pci.1 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.1.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index aee15cf17e..961c62971c 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device spapr-pci-host-bridge,index=1,id=pci.2 \
 -device spapr-pci-host-bridge,index=2,id=pci.1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args b/tests/qemuxml2argvdata/pseries-many-devices.args
index 1cf9f4ee88..a108e44136 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -58,4 +57,5 @@ QEMU_AUDIO_DRV=none \
 -device virtio-scsi-pci,id=scsi29,bus=pci.0,addr=0x1e \
 -device virtio-scsi-pci,id=scsi30,bus=pci.0,addr=0x1f \
 -device virtio-scsi-pci,id=scsi31,bus=pci.1.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args b/tests/qemuxml2argvdata/pseries-nvram.args
index 5bfbb39abb..f411777dc5 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -global spapr-nvram.reg=0x4000 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemuxml2argvdata/pseries-panic-missing.args
index 64dc188718..67f927a1fa 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index 64dc188718..67f927a1fa 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index d89f493a52..6891512a31 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device spapr-pci-host-bridge,index=1,id=pci.1 \
 -device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index dbf193409e..62d38ce2b6 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -device spapr-pci-host-bridge,index=1,id=pci.1,numa_node=1 \
 -device spapr-pci-host-bridge,index=2,id=pci.2 \
 -device spapr-pci-host-bridge,index=3,id=pci.3,numa_node=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args b/tests/qemuxml2argvdata/pseries-phb-simple.args
index d89f493a52..6891512a31 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -device spapr-pci-host-bridge,index=1,id=pci.1 \
 -device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemuxml2argvdata/pseries-serial-native.args
index 2b08627e3d..1fb4b31dd2 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args b/tests/qemuxml2argvdata/pseries-serial-pci.args
index b8f4876734..458970c329 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -chardev pty,id=charserial0 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args b/tests/qemuxml2argvdata/pseries-serial-usb.args
index 0702bbb224..e4c3ef54ec 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=guest,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \
 -chardev pty,id=charserial0 \
 -device usb-serial,chardev=charserial0,id=serial0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args b/tests/qemuxml2argvdata/pseries-usb-default.args
index 581a6ae549..c491eb69b2 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 901a00e1c3..2a725806af 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
 -device usb-kbd,id=input0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args b/tests/qemuxml2argvdata/pseries-usb-multi.args
index 94b59ee47f..ac122b6586 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -device pci-ohci,id=usb1,bus=pci.0,addr=0x2 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index a0750c7d39..34e9b83556 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -34,4 +33,5 @@ QEMU_AUDIO_DRV=none \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=536870912 \
 -chardev pty,id=charserial1 \
 -device spapr-vty,chardev=charserial1,id=serial1,reg=805310464 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
index a9a393eef9..a5a641b49b 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -6,7 +6,6 @@ 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-ppc64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -34,4 +33,5 @@ QEMU_AUDIO_DRV=none \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
 -chardev pty,id=charserial1 \
 -device spapr-vty,chardev=charserial1,id=serial1,reg=805310464 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 56defbc6fe..bc178aab47 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
 -device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
 -device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args
index f98ae9e6af..f21bb11671 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -45,5 +44,6 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=20,chassis=17,id=pci.17,bus=pcie.0,addr=0x2.0x4 \
 -device ioh3420,port=21,chassis=18,id=pci.18,bus=pcie.0,addr=0x2.0x5 \
 -device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 7d761c5875..7f2b2ef068 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -31,6 +30,7 @@ QEMU_AUDIO_DRV=none \
 -device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
 -netdev user,id=hostnet0 \
 -device e1000e,netdev=hostnet0,id=net0,mac=52:54:00:aa:bf:ef,bus=pci.2,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device intel-hda,id=sound0,bus=pci.3,addr=0x0 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index ef3767af3a..019943f6dd 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -55,6 +54,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input1,bus=pci.11,addr=0x0 \
 -device virtio-keyboard-pci,id=input2,bus=pci.12,addr=0x0 \
 -device virtio-tablet-pci,id=input3,bus=pci.13,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.8,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index d860f8ca09..2f922f9352 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -56,6 +55,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input1,bus=pci.13,addr=0x0 \
 -device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \
 -device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 05b1b98a0d..50eb2fa109 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
index d65c3379db..3a6437cf31 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 4d59460a13..0722fd972e 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -42,5 +41,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 8af10dbcfe..43cb4657bc 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -42,5 +41,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 94e6713d7e..745a7bdbc4 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 32875f291c..4c8e2781c7 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-virt-manager-basic/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-virt-manager-basic/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
-QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-x86_64 \
 -name guest=virt-manager-basic,debug-threads=on \
 -S \
@@ -46,10 +45,11 @@ QEMU_AUDIO_DRV=spice \
 -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 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=off,seamless-migration=on \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pcie.0,addr=0x1 \
 -device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
 -chardev spicevmc,id=charredir0,name=usbredir \
 -device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
 -chardev spicevmc,id=charredir1,name=usbredir \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 887141ebe1..6fc72ca1df 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -56,6 +55,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input1,bus=pci.2,addr=0x9 \
 -device virtio-keyboard-pci,id=input2,bus=pci.2,addr=0xa \
 -device virtio-tablet-pci,id=input3,bus=pci.2,addr=0xb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x6 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 370110db7d..5054c6ca17 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
 -device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
index eecf66f325..c96042232b 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -6,7 +6,6 @@ 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 \
 NS=ns \
 BAR='' \
 /usr/bin/qemu-system-i386 \
@@ -31,6 +30,7 @@ BAR='' \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -unknown parameter \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 2b92249803..879f0b3e40 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -unknown parameter \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index f8a72d2bca..2b161b0919 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot reboot-timeout=-1,strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index 8f0213c8e5..570c3d0f70 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot reboot-timeout=128,strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
index d65ed70b2f..96a756603d 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -incoming fd:7 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
index c24cde2b76..c930c83f0c 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -incoming exec:cat \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index 34247c1b6e..5833041823 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-riscv64/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-riscv64 \
 -name guest=riscv64,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -append root=/dev/vda \
 -drive file=/var/lib/libvirt/images/riscv64.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-pci,bus=pcie.0,addr=0x1,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args
index a11dd6e1e3..ba21b2f307 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-riscv64/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-riscv64 \
 -name guest=riscv64,debug-threads=on \
 -S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-device,id=balloon0 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args
index f353802d6e..a0e11764d7 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,devno=fe.0.0001,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0002 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.args
index a021b706b3..735e64b728 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.args
index 50ab7293a2..f4c7403543 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -device sclpconsole,chardev=charserial0,id=serial0 \
 -chardev pty,id=charserial1 \
 -device sclplmconsole,chardev=charserial1,id=serial1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.args
index 81a864fae5..3e18863b6d 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -chardev pty,id=charserial0 \
 -device sclpconsole,chardev=charserial0,id=serial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvdata/s390-serial.args
index 81a864fae5..3e18863b6d 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -chardev pty,id=charserial0 \
 -device sclpconsole,chardev=charserial0,id=serial0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index 14572d10be..c722de5d51 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-1 \
 -device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 9fc649e8c3..13911e128c 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 11e79f8eb5..9f023da2d4 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
index e2f7b706da..3c4b30c577 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -add-fd set=0,fd=1750,opaque=serial0-source \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
index 1845320539..c06750eac6 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,4 +32,5 @@ QEMU_AUDIO_DRV=none \
 -add-fd set=1,fd=1751,opaque=serial0-log \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on,logfile=/dev/fdset/1,logappend=on \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
index 8e827f08d3..5a82badf63 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -add-fd set=0,fd=1750,opaque=serial1-source \
 -chardev file,id=charserial1,path=/dev/fdset/0,append=on \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 30d6d5545c..cf08357b27 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
index 79d738f30c..f736af38d5 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-x86_64 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -31,6 +30,7 @@ QEMU_AUDIO_DRV=spice \
 -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 0ea0c9846d..6450ecdf8d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 80b8d8c173..7ba22be033 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,wait=off \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index a277345c75..9a8988b79e 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555 \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 162de2be7a..9cdf2ca6f5 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 162de2be7a..9cdf2ca6f5 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index e2fcd4210c..3cf523bb80 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -35,5 +34,6 @@ QEMU_AUDIO_DRV=none \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on,passwordid=charserial1-secret0 \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 488c770045..4cbd3b4f4c 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 9947742c08..4a4c4e18ff 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev socket,id=charserial1,fd=1729,server=on,wait=off \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
index f296990f03..7731c71fcc 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
 -chardev vc,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 47d6bdc1aa..763c30de12 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,size=4194304,share=on \
 -device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x2 \
 -object memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,size=134217728,share=on \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 45ef8dce5b..0902724ff8 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x2 \
 -device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x3 \
 -device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
index 95817db881..975161796d 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 6541b29312..35d92270d9 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index e77678885a..4279a34cae 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
index 95817db881..975161796d 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 0de55f9d71..c0b940a2f7 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -chardev spicevmc,id=charsmartcard0,name=smartcard \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index e24aa7fc65..a7fd35fea9 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1 \
 -chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server=on,wait=off \
 -device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 6341ec9fc0..986f72f6c7 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 9e976e31bb..31f56159ca 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -6,7 +6,6 @@ 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 \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 25e7a35612..4b0188b706 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 379b45fa4c..d2d4368d29 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
index d3a418ce61..6d8c2b5372 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,22 +28,23 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x2 \
--device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \
+-device sb16,id=sound2,audiodev=audio1 \
+-device AC97,id=sound3,audiodev=audio1,bus=pci.0,addr=0x3 \
 -device intel-hda,id=sound4,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 \
+-device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0,audiodev=audio1 \
 -device intel-hda,id=sound5,bus=pci.0,addr=0x5 \
--device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \
--device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \
--device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \
+-device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0,audiodev=audio1 \
+-device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1,audiodev=audio1 \
+-device hda-output,id=sound5-codec2,bus=sound5.0,cad=2,audiodev=audio1 \
 -device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x6 \
--device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \
+-device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0,audiodev=audio1 \
 -device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x7 \
--device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \
--device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \
--device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \
--device usb-audio,id=sound8,bus=usb.0,port=1 \
+-device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0,audiodev=audio1 \
+-device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1,audiodev=audio1 \
+-device hda-output,id=sound7-codec2,bus=sound7.0,cad=2,audiodev=audio1 \
+-device usb-audio,id=sound8,audiodev=audio1,bus=usb.0,port=1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 1cffb935c2..c2f923e51a 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,8 +28,9 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x2 \
--device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \
+-device sb16,id=sound2,audiodev=audio1 \
+-device AC97,id=sound3,audiodev=audio1,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.args
index 1296ef1771..5877b88013 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-redhat62sparc/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-redhat62sparc/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-redhat62sparc/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-sparc \
 -name guest=redhat62sparc,debug-threads=on \
 -S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
 -device scsi-hd,bus=scsi.0,scsi-id=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
 -drive file=/home/berrange/VirtualMachines/redhat-6.2-sparc.iso,format=raw,if=none,id=drive-scsi0-0-0-1,readonly=on \
 -device scsi-cd,bus=scsi.0,scsi-id=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 88871b015c..f891a3dc77 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index 1dd79d8946..5fb4553776 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=q35-test,debug-threads=on \
 -S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index fb9e2746ba..a88b2b47dc 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
index 5e4edc24b6..feb7ae4ffa 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
index 75e09d7d02..7e48b9aa4a 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index 805bfe6f58..0bce84c997 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -6,7 +6,6 @@ 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 \
@@ -46,5 +45,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-tablet,id=input13,bus=usb.0,port=1.1.7 \
 -device usb-tablet,id=input14,bus=usb.0,port=1.1.8 \
 -device usb-tablet,id=input15,bus=usb.0,port=2.1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index aa0400b933..1df0713728 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input1,bus=usb.0,port=1.1 \
 -device usb-mouse,id=input2,bus=usb.0,port=1.2 \
 -device usb-tablet,id=input3,bus=usb.0,port=1.3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 505da01810..8ab0eeceb8 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -usb \
 -device usb-hub,id=hub0,bus=usb.0,port=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index 7c4436fee2..98ef795c4f 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -6,7 +6,6 @@ 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 \
@@ -35,5 +34,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=3 \
 -device usb-mouse,id=input1,bus=usb.0,port=4 \
 -device usb-mouse,id=input2,bus=usb.0,port=5 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
index b43dd84025..9b206d3662 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 27c3ee1f17..9ea4d60e94 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -6,7 +6,6 @@ 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 \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
 -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
 -device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
index f4ec521ca6..3bef5b2e03 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -6,7 +6,6 @@ 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 \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-hub,id=hub1,bus=usb.0,port=1.1 \
 -device usb-hub,id=hub2,bus=usb.0,port=1.1.1 \
 -device usb-hub,id=hub3,bus=usb.0,port=1.1.1.1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 0000f6ee13..15f37829c1 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -6,7 +6,6 @@ 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 \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
index ca034d6885..c6ef400c5d 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
index da2611c430..c20e22e623 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=1.1 \
 -device usb-mouse,id=input1,bus=usb.0,port=1.2 \
 -device usb-mouse,id=input2,bus=usb.0,port=1.3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
index 8ba74ec735..0f257fee3f 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-hub,id=hub0,bus=usb.0,port=1 \
 -device usb-hub,id=hub1,bus=usb.0,port=2 \
 -device usb-mouse,id=input0,bus=usb.0,port=1.1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
index 458dff8286..a11986ce3d 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=1.1 \
 -device usb-mouse,id=input1,bus=usb.0,port=1.2.1 \
 -device usb-mouse,id=input2,bus=usb.0,port=1.2.2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
index 59edb9705f..b29df8721a 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -chardev socket,id=charredir0,host=localhost,port=4000 \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 67e9471694..593bb31f2f 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -26,6 +25,7 @@ QEMU_AUDIO_DRV=spice \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -chardev spicevmc,id=charredir0,name=usbredir \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
index 9b00bc2a9f..7c8a4bc729 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -chardev spicevmc,id=charredir0,name=usbredir \
diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
index d4eb6e1371..94634f5446 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -chardev socket,id=charredir0,host=localhost,port=4000 \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 71b3777ded..a8abeb4f70 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -6,7 +6,6 @@ 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 \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
 -device usb-mouse,id=input0,bus=usb.0,port=3 \
 -device usb-mouse,id=input1,bus=usb.0,port=4 \
 -device usb-mouse,id=input2,bus=usb.0,port=5 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
index 429be6c3a1..f4c3741def 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -6,7 +6,6 @@ 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 \
@@ -37,6 +36,7 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
 -device usb-hub,id=hub0,bus=usb1.0,port=1 \
 -device usb-tablet,id=input0,bus=usb.0,port=2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb2.0,port=1 \
 -device usb-host,hostbus=14,hostaddr=7,id=hostdev1,bus=usb2.0,port=2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
index 6906abd4c1..932c3ea296 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=gentoo,debug-threads=on \
 -S \
@@ -35,6 +34,7 @@ QEMU_AUDIO_DRV=none \
 -device ich9-usb-uhci1,masterbus=ua-myUSB5.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \
 -device ich9-usb-uhci2,masterbus=ua-myUSB5.0,firstport=2,bus=pci.0,addr=0x5.0x1 \
 -device ich9-usb-uhci3,masterbus=ua-myUSB5.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=ua-myUSB1.0,port=3 \
 -device usb-host,hostbus=15,hostaddr=6,id=hostdev1,bus=ua-myUSB5.0,port=3 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
index c80be4b439..25eb4f4f90 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=gentoo,debug-threads=on \
 -S \
@@ -60,9 +59,10 @@ QEMU_AUDIO_DRV=none \
 -device isa-serial,chardev=charserial1,id=serial1,index=1 \
 -chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
--vnc 127.0.0.1:0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 515a849e8e..f5b24e1875 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -6,7 +6,6 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
-QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
 -name guest=dummy2,debug-threads=on \
 -S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 688585f049..50f5067a9d 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,7 +27,8 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \
 -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
 -device qxl,id=video2,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
index b215889d2d..533bb92786 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
--vnc 127.0.0.1:0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index 93c582c100..7c5d1ef124 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
index c5b2267e42..666f47a59c 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
index 1c1943ef05..10d431a633 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device qxl,id=video2,max_outputs=7,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 39699d8a52..453c572a4b 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 17482f9056..c48eef1b4a 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=8,xres=1280,yres=720,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index d5b54cfac7..560bbfd9b0 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 3a4fd981b4..9d9d883e60 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 75b47c12f5..73fe9a0672 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
index ac19b4365e..296ac69132 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device VGA,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 1c1943ef05..10d431a633 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
 -device qxl,id=video2,max_outputs=7,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index d002b6daea..42354c6eca 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -26,7 +25,8 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--vnc 127.0.0.1:0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
 -device virtio-gpu-ccw,id=video0,max_outputs=1,devno=fe.0.0002 \
 -device virtio-gpu-ccw,id=video1,max_outputs=1,devno=fe.0.0003 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 012f8e50b9..72d3c3bde3 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 6061c6a34b..248bb6faf4 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-gpu-pci,id=video1,max_outputs=1,bus=pci.0,addr=0x4 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index 1b32054121..c16450e3fd 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -6,7 +6,6 @@ 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=spice \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=spice \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \
 -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 5851e93804..ab7686b3f8 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
index bf864efec0..75be9dc8ed 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -usb \
 -drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
 -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-vga,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 4e45f27965..8f646201e2 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -6,7 +6,6 @@ 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 \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
 -boot strict=on \
 -usb \
 -device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
index 34164771c8..c21b482d5d 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -6,7 +6,6 @@ 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 \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
 -device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x3 \
 -device virtio-keyboard-pci,id=input1,bus=pci.0,addr=0xa \
 -device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x4 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 0c235200e3..11650f12b3 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -6,7 +6,6 @@ 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-s390x \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
@@ -30,6 +29,7 @@ QEMU_AUDIO_DRV=none \
 -device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
 -object rng-random,id=objrng0,filename=/dev/hwrng \
 -device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0002 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
index d4171e4ca3..ff997d006c 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
index 21d2cb8e47..425bfc212c 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
 -object rng-egd,id=objrng0,chardev=charrng0 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 7df6301d57..b7fbbc6110 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -object rng-random,id=objrng0,filename=/dev/random \
 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
index ee4afdf364..1468629efb 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -6,7 +6,6 @@ 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 \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
 -no-acpi \
 -boot strict=on \
 -usb \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -object rng-random,id=objrng0,filename=/dev/urandom \
 -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index b19675561a..b1912a19d9 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -6,7 +6,6 @@ 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 \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
 -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 \
+-audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -device vmcoreinfo \
 -msg timestamp=on
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:22 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:22 +0200
Subject: [PATCH 17/20] qemu: command: Drop qemuBuildAudioCommandLine thin
 wrapper
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <e0836f35fdd7aa69f36ff475d4b83b93b9a99c4a.1657884290.git.pkrempa@redhat.com>

Rename qemuBuildAudioCommandLineArgs to qemuBuildAudioCommandLine and
fix the arguments.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 57e8115db3..5af6ef5e11 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8019,8 +8019,8 @@ qemuBuildAudioCommandLineArg(virCommand *cmd,
 }

 static int
-qemuBuildAudioCommandLineArgs(virCommand *cmd,
-                              virDomainDef *def)
+qemuBuildAudioCommandLine(virCommand *cmd,
+                          virDomainDef *def)
 {
     size_t i;
     for (i = 0; i < def->naudios; i++) {
@@ -8031,15 +8031,6 @@ qemuBuildAudioCommandLineArgs(virCommand *cmd,
 }


-static int
-qemuBuildAudioCommandLine(virCommand *cmd,
-                          virDomainDef *def,
-                          virQEMUCaps *qemuCaps G_GNUC_UNUSED)
-{
-    return qemuBuildAudioCommandLineArgs(cmd, def);
-}
-
-
 static int
 qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfig *cfg G_GNUC_UNUSED,
                                 virCommand *cmd,
@@ -10489,7 +10480,7 @@ qemuBuildCommandLine(virDomainObj *vm,
     if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0)
         return NULL;

-    if (qemuBuildAudioCommandLine(cmd, def, qemuCaps) < 0)
+    if (qemuBuildAudioCommandLine(cmd, def) < 0)
         return NULL;

     if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps) < 0)
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:21 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:21 +0200
Subject: [PATCH 16/20] qemu: command: Drop the code for configuring audio
 devices via environment variables
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <5f92ba8c5e39aca869da59fe21ec69bb5ae0a370.1657884290.git.pkrempa@redhat.com>

Remove the old now unused code.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 183 ----------------------------------------
 1 file changed, 183 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4d9a0eb2e1..57e8115db3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8030,189 +8030,6 @@ qemuBuildAudioCommandLineArgs(virCommand *cmd,
     return 0;
 }

-static void
-qemuBuildAudioCommonEnv(virCommand *cmd,
-                        const char *prefix,
-                        virDomainAudioIOCommon *def)
-{
-    if (def->fixedSettings)
-        virCommandAddEnvFormat(cmd, "%sFIXED_SETTINGS=%s",
-                               prefix,
-                               virTristateSwitchTypeToString(def->fixedSettings));
-
-    if (def->voices)
-        virCommandAddEnvFormat(cmd, "%sVOICES=%u",
-                               prefix, def->voices);
-
-    if (def->fixedSettings) {
-        if (def->frequency)
-            virCommandAddEnvFormat(cmd, "%sFIXED_FREQ=%u",
-                                   prefix, def->frequency);
-        if (def->channels)
-            virCommandAddEnvFormat(cmd, "%sFIXED_CHANNELS=%u",
-                                   prefix, def->channels);
-        if (def->format)
-            virCommandAddEnvFormat(cmd, "%sFIXED_FMT=%s",
-                                   prefix,
-                                   virDomainAudioFormatTypeToString(def->format));
-    }
-}
-
-static void
-qemuBuildAudioALSAEnv(virCommand *cmd,
-                      const char *prefix,
-                      virDomainAudioIOALSA *def)
-{
-    if (def->dev)
-        virCommandAddEnvFormat(cmd, "%sDEV=%s",
-                               prefix, def->dev);
-}
-
-static void
-qemuBuildAudioCoreAudioEnv(virCommand *cmd,
-                           virDomainAudioDef *def)
-{
-    if (def->backend.coreaudio.output.bufferCount)
-        virCommandAddEnvFormat(cmd, "QEMU_COREAUDIO_BUFFER_COUNT=%u",
-                               def->backend.coreaudio.output.bufferCount);
-    if (def->output.bufferLength)
-        virCommandAddEnvFormat(cmd, "QEMU_COREAUDIO_BUFFER_SIZE=%u",
-                               def->output.bufferLength);
-}
-
-static void
-qemuBuildAudioOSSEnv(virCommand *cmd,
-                     const char *prefix,
-                     const char *prefix2,
-                     virDomainAudioIOOSS *def)
-{
-    if (def->dev)
-        virCommandAddEnvFormat(cmd, "%sDEV=%s",
-                               prefix, def->dev);
-    if (def->tryPoll)
-        virCommandAddEnvFormat(cmd, "%sTRY_POLL=%s", prefix2,
-                               virTristateSwitchTypeToString(def->tryPoll));
-}
-
-static void
-qemuBuildAudioPulseAudioEnv(virCommand *cmd,
-                            virDomainAudioDef *def)
-{
-    if (def->backend.pulseaudio.input.name)
-        virCommandAddEnvPair(cmd, "QEMU_PA_SOURCE",
-                             def->backend.pulseaudio.input.name);
-    if (def->backend.pulseaudio.output.name)
-        virCommandAddEnvPair(cmd, "QEMU_PA_SINK",
-                             def->backend.pulseaudio.output.name);
-
-    if (def->input.bufferLength)
-        virCommandAddEnvFormat(cmd, "QEMU_PA_SAMPLES=%u",
-                               def->input.bufferLength);
-
-    if (def->backend.pulseaudio.serverName)
-        virCommandAddEnvPair(cmd, "QEMU_PA_SERVER=%s",
-                             def->backend.pulseaudio.serverName);
-}
-
-
-static int G_GNUC_UNUSED
-qemuBuildAudioCommandLineEnv(virCommand *cmd,
-                             virDomainDef *def)
-{
-    virDomainAudioDef *audio;
-    if (def->naudios != 1)
-        return 0;
-
-    audio = def->audios[0];
-    virCommandAddEnvPair(cmd, "QEMU_AUDIO_DRV",
-                         qemuAudioDriverTypeToString(audio->type));
-
-    if (audio->timerPeriod)
-        virCommandAddEnvFormat(cmd, "QEMU_AUDIO_TIMER_PERIOD=%u",
-                               audio->timerPeriod);
-
-    qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_ADC_", &audio->input);
-    qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_DAC_", &audio->output);
-
-    switch (audio->type) {
-    case VIR_DOMAIN_AUDIO_TYPE_NONE:
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_ALSA:
-        qemuBuildAudioALSAEnv(cmd, "QEMU_AUDIO_ADC_", &audio->backend.alsa.input);
-        qemuBuildAudioALSAEnv(cmd, "QEMU_AUDIO_DAC_", &audio->backend.alsa.output);
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
-        qemuBuildAudioCoreAudioEnv(cmd, audio);
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_JACK:
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_OSS:
-        qemuBuildAudioOSSEnv(cmd, "QEMU_OSS_ADC_", "QEMU_AUDIO_ADC_",
-                             &audio->backend.oss.input);
-        qemuBuildAudioOSSEnv(cmd, "QEMU_OSS_DAC_", "QEMU_AUDIO_DAC_",
-                             &audio->backend.oss.output);
-
-        if (audio->backend.oss.input.bufferCount)
-            virCommandAddEnvFormat(cmd, "QEMU_OSS_NFRAGS=%u",
-                                   audio->backend.oss.input.bufferCount);
-
-        if (audio->backend.oss.tryMMap)
-            virCommandAddEnvFormat(cmd, "QEMU_OSS_MMAP=%s",
-                                   virTristateSwitchTypeToString(audio->backend.oss.tryMMap));
-        if (audio->backend.oss.exclusive)
-            virCommandAddEnvFormat(cmd, "QEMU_OSS_EXCLUSIVE=%s",
-                                   virTristateSwitchTypeToString(audio->backend.oss.exclusive));
-        if (audio->backend.oss.dspPolicySet)
-            virCommandAddEnvFormat(cmd, "QEMU_OSS_POLICY=%d",
-                                   audio->backend.oss.dspPolicy);
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO:
-        qemuBuildAudioPulseAudioEnv(cmd, audio);
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_SDL:
-        if (audio->output.bufferLength)
-            virCommandAddEnvFormat(cmd, "QEMU_SDL_SAMPLES=%u",
-                                   audio->output.bufferLength);
-
-        if (audio->backend.sdl.driver) {
-            /*
-             * Some SDL audio driver names are different on SDL 1.2
-             * vs 2.0.  Given how old SDL 1.2 is, we're not going
-             * make any attempt to support it here as it is unlikely
-             * to have an real world users. We can assume libvirt
-             * driver name strings match SDL 2.0 names.
-             */
-            virCommandAddEnvPair(cmd, "SDL_AUDIODRIVER",
-                                 virDomainAudioSDLDriverTypeToString(
-                                     audio->backend.sdl.driver));
-        }
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_SPICE:
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_FILE:
-        if (audio->backend.file.path)
-            virCommandAddEnvFormat(cmd, "QEMU_WAV_PATH=%s",
-                                   audio->backend.file.path);
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_DBUS:
-        break;
-
-    case VIR_DOMAIN_AUDIO_TYPE_LAST:
-    default:
-        virReportEnumRangeError(virDomainAudioType, audio->type);
-        return -1;
-    }
-    return 0;
-}

 static int
 qemuBuildAudioCommandLine(virCommand *cmd,
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:23 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:23 +0200
Subject: [PATCH 18/20] qemu: validate: Remove unreachable checks for
 QEMU_CAPS_AUDIODEV
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <ecaccd1d40efb961d02b50a4faf16c8dbdbc1b64.1657884290.git.pkrempa@redhat.com>

We now only support qemu versions which already have the capability so
we can remove this now unused code.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_validate.c | 86 ----------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 764d5b029e..4016b1b6f0 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1344,13 +1344,6 @@ qemuValidateDomainDef(const virDomainDef *def,
         }
     }

-    if (def->naudios > 1 &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("only one audio backend is supported with this QEMU binary"));
-        return -1;
-    }
-
     return 0;
 }

@@ -4530,25 +4523,6 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
                                  const virDomainDef *def,
                                  virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 {
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-        if (audio->input.mixingEngine == VIR_TRISTATE_BOOL_NO ||
-            audio->output.mixingEngine == VIR_TRISTATE_BOOL_NO) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("disabling audio mixing engine is not supported with this QEMU"));
-            return -1;
-        }
-
-        if ((audio->input.bufferLength ||
-             audio->output.bufferLength) &&
-            (audio->type != VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO &&
-             audio->type != VIR_DOMAIN_AUDIO_TYPE_COREAUDIO &&
-             audio->type != VIR_DOMAIN_AUDIO_TYPE_SDL)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("setting audio buffer length is not supported with this QEMU"));
-            return -1;
-        }
-    }
-
     switch (audio->type) {
     case VIR_DOMAIN_AUDIO_TYPE_NONE:
         break;
@@ -4557,78 +4531,18 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
         break;

     case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-            if (audio->input.bufferLength) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio buffer length is not supported with this QEMU"));
-                return -1;
-            }
-            if (audio->backend.coreaudio.input.bufferCount) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio buffer count is not supported with this QEMU"));
-                return -1;
-            }
-        }
         break;

     case VIR_DOMAIN_AUDIO_TYPE_JACK:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("'jack' audio backend is not supported with this QEMU"));
-            return -1;
-        }
         break;

     case VIR_DOMAIN_AUDIO_TYPE_OSS:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-            if (audio->backend.oss.input.bufferCount !=
-                audio->backend.oss.output.bufferCount) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio buffer count is not supported with this QEMU"));
-                return -1;
-            }
-        }
         break;

     case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-            if (audio->backend.pulseaudio.input.streamName ||
-                audio->backend.pulseaudio.output.streamName) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio stream name is not supported with this QEMU"));
-                return -1;
-            }
-
-            if (audio->backend.pulseaudio.input.latency ||
-                audio->backend.pulseaudio.output.latency) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio latency is not supported with this QEMU"));
-                return -1;
-            }
-
-            if (audio->input.bufferLength != audio->output.bufferLength) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio buffer length is not supported with this QEMU"));
-                return -1;
-            }
-        }
         break;

     case VIR_DOMAIN_AUDIO_TYPE_SDL:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
-            if (audio->input.bufferLength) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio buffer length is not supported with this QEMU"));
-                return -1;
-            }
-
-            if (audio->backend.sdl.input.bufferCount ||
-                audio->backend.sdl.output.bufferCount) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("setting audio buffer count is not supported with this QEMU"));
-                return -1;
-            }
-        }
         break;

     case VIR_DOMAIN_AUDIO_TYPE_SPICE:
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:24 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:24 +0200
Subject: [PATCH 19/20] qemuxml2(argv|xml)test: Remove use of
 QEMU_CAPS_AUDIODEV in fake-caps tests
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <ac0768876380d1b94bd54749c31744a295fe8c7e.1657884290.git.pkrempa@redhat.com>

The code no longer uses the capability so the tests don't need to assert
it.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuxml2argvtest.c |  2 +-
 tests/qemuxml2xmltest.c  | 20 +++++++++-----------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4897d2f87b..07bd40d6e9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1490,7 +1490,7 @@ mymain(void)
     DO_TEST("graphics-dbus-p2p",
             QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
     DO_TEST("graphics-dbus-audio",
-            QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS, QEMU_CAPS_AUDIODEV);
+            QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
     DO_TEST("graphics-dbus-chardev",
             QEMU_CAPS_DEVICE_ISA_SERIAL,
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4eabefada0..9db28b14cf 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -411,8 +411,7 @@ mymain(void)
             QEMU_CAPS_DISPLAY_DBUS);
     DO_TEST("graphics-dbus-audio",
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
-            QEMU_CAPS_DISPLAY_DBUS,
-            QEMU_CAPS_AUDIODEV);
+            QEMU_CAPS_DISPLAY_DBUS);
     DO_TEST("graphics-dbus-chardev",
             QEMU_CAPS_DEVICE_CIRRUS_VGA,
             QEMU_CAPS_DISPLAY_DBUS);
@@ -1401,18 +1400,17 @@ mymain(void)
     DO_TEST_NOCAPS("audio-file-best");

     /* Full <audio> only compat with new QEMU -audiodev args */
-    DO_TEST("audio-none-full", QEMU_CAPS_AUDIODEV);
-    DO_TEST("audio-alsa-full", QEMU_CAPS_AUDIODEV);
-    DO_TEST("audio-coreaudio-full", QEMU_CAPS_AUDIODEV);
-    DO_TEST("audio-jack-full", QEMU_CAPS_AUDIODEV);
-    DO_TEST("audio-oss-full", QEMU_CAPS_AUDIODEV);
-    DO_TEST("audio-pulseaudio-full", QEMU_CAPS_AUDIODEV);
-    DO_TEST("audio-sdl-full", QEMU_CAPS_AUDIODEV);
+    DO_TEST_NOCAPS("audio-none-full");
+    DO_TEST_NOCAPS("audio-alsa-full");
+    DO_TEST_NOCAPS("audio-coreaudio-full");
+    DO_TEST_NOCAPS("audio-jack-full");
+    DO_TEST_NOCAPS("audio-oss-full");
+    DO_TEST_NOCAPS("audio-pulseaudio-full");
+    DO_TEST_NOCAPS("audio-sdl-full");
     DO_TEST("audio-spice-full",
-            QEMU_CAPS_AUDIODEV,
             QEMU_CAPS_SPICE,
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
-    DO_TEST("audio-file-full", QEMU_CAPS_AUDIODEV);
+    DO_TEST_NOCAPS("audio-file-full");

     DO_TEST_CAPS_LATEST("audio-many-backends");

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 11:44:25 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 13:44:25 +0200
Subject: [PATCH 20/20] qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <e9b7c7bc687c66f7936bd1666289ffb30f72a59b.1657884290.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c02fef6acd..e4295aa8a9 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -620,7 +620,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 395 */
               "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */
-              "audiodev", /* QEMU_CAPS_AUDIODEV */
+              "audiodev", /* X_QEMU_CAPS_AUDIODEV */
               "blockdev-backup", /* QEMU_CAPS_BLOCKDEV_BACKUP */
               "object.qapified", /* QEMU_CAPS_OBJECT_JSON */
               "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */
@@ -3306,7 +3306,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "spice", "gl", QEMU_CAPS_SPICE_GL },
     { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
     { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL },
-    { "vnc", "audiodev", QEMU_CAPS_AUDIODEV },
 };

 static int
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a409c1272c..14ecdabe60 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -599,7 +599,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 395 */
     QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */
-    QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */
+    X_QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */
     QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */
     QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */
     QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 875e491581..51f2dfa246 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 428ecd4f42..93b8e8b8a2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -154,7 +154,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 725745593c..401aa2d22d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -121,7 +121,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 6a54c44d79..b198448036 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -199,7 +199,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 35998cabf0..e27a250ad4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -166,7 +166,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index b8ddf2e9a8..5ee8feed6c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -172,7 +172,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c49c258255..438eb94ca8 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -158,7 +158,6 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index ce297f2ef5..12f97ca168 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -206,7 +206,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index e6a3ed5ec0..c53b6054dd 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -80,7 +80,6 @@
   <flag name='netdev.vhost-vdpa'/>
   <flag name='ncr53c90'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a49650cbcc..ffbc83333a 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -208,7 +208,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 42a4418a08..f32d0d6107 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -170,7 +170,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index d0dd058743..d0694c2605 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -174,7 +174,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 25339f86d9..963e742470 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -160,7 +160,6 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 30d10236e9..c03b43df0f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -128,7 +128,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4ff03dbead..805b8acaf2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -209,7 +209,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 2d861da97b..dc3944383f 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -173,7 +173,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 06543071aa..84aa09fc76 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -130,7 +130,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 38acee5f18..f089a30a06 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -212,7 +212,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index b03c6bfc24..7ca644202b 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -212,7 +212,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 942c0ba169..dd13c1ea4c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -182,7 +182,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 983b54430d..fa3eaab75b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -175,7 +175,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 32f226acbd..af85cb41b2 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -212,7 +212,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index f4d7cbdd10..88247e586f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -183,7 +183,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 2f895294de..ad3b50ce23 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -186,7 +186,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 17ea778d38..617c101a5d 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -212,7 +212,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 5f5c839fea..8393400779 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -212,7 +212,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='audiodev'/>
   <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
-- 
2.36.1


From cfontana at suse.de  Fri Jul 15 11:54:26 2022
From: cfontana at suse.de (Claudio Fontana)
Date: Fri, 15 Jul 2022 13:54:26 +0200
Subject: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to
 qemu-4.2 (part 1)
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <e42b3483-c86c-b463-be25-30a1e6488c07@suse.de>

Hello Peter,

can we retire as well support for migration_set_speed then?

The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are overcomplicating qemu_migration.c and qemu_driver.c in my view.

Thanks,

Claudio


On 7/15/22 13:44, Peter Krempa wrote:
> In August Debian 10 officially reaches EOL, thus we can bump minimum
> qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
> 
> QEMU-4.2 allows us to remove a big bunch of old code though. Few
> examples which this series (and the next iterations of it)  will deal
> with:
>  - old auidiodev config via ENV variables
>  - old-style VIRTIO tranitional setup (possibly)
>  - most of legacy block device setup (upcoming series)
> 
> This series is lacking the removal of Debian 10 from our CI infra
> though, I'll post that separately once I get to it.
> 
> The patches can also be fetched at:
> 
>  git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
> 
> as some of the pure-removal patches here will be truncated to prevent
> spamming the list.
> 
> Peter Krempa (20):
>   qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
>     'x86-kvm-32-on-64'
>   tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
>     tests
>   qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
>   qemuxml2argvtest: Remove 'qemu-3.1' versions of
>     virtio-(non-)transitional tests
>   qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
>     test
>   qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
>     case
>   qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
>     and 'cpu-tsc-frequency'
>   tests: qemucapabilities: Remove qemu-3.1 test data
>   tests: domaincaps: Remove test data for qemu-3.1
>   qemucapabilitiestest: Remove test data for qemu-4.0
>   domaincapstest: Remove test data for qemu-4.0
>   qemucapabilitiestest: Remove test data for qemu-4.1
>   domaincapstest: Remove test data for qemu-4.1
>   qemu: Formally deprecate support for qemu < 4.2
>   qemu: command: Always assume QEMU_CAPS_AUDIODEV
>   qemu: command: Drop the code for configuring audio devices via
>     environment variables
>   qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
>   qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
>   qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
>     tests
>   qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
> 
>  docs/drvqemu.rst                              |     2 +-
>  src/qemu/qemu_capabilities.c                  |     7 +-
>  src/qemu/qemu_capabilities.h                  |     2 +-
>  src/qemu/qemu_command.c                       |   221 +-
>  src/qemu/qemu_validate.c                      |    86 -
>  .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   211 -
>  .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   230 -
>  tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   138 -
>  tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   211 -
>  .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   211 -
>  .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   230 -
>  .../qemu_4.0.0-virt.aarch64.xml               |   179 -
>  tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   173 -
>  tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   139 -
>  tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   236 -
>  tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   211 -
>  .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   217 -
>  .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   233 -
>  tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   217 -
>  .../caps_3.1.0.ppc64.replies                  | 23732 ---------------
>  .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |  1072 -
>  .../caps_3.1.0.x86_64.replies                 | 24428 ---------------
>  .../caps_3.1.0.x86_64.xml                     |  1387 -
>  .../caps_4.0.0.aarch64.replies                | 20893 -------------
>  .../caps_4.0.0.aarch64.xml                    |   363 -
>  .../caps_4.0.0.ppc64.replies                  | 24461 ---------------
>  .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |  1091 -
>  .../caps_4.0.0.riscv32.replies                | 18154 -----------
>  .../caps_4.0.0.riscv32.xml                    |   157 -
>  .../caps_4.0.0.riscv64.replies                | 18154 -----------
>  .../caps_4.0.0.riscv64.xml                    |   157 -
>  .../caps_4.0.0.s390x.replies                  | 21721 -------------
>  .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  2891 --
>  .../caps_4.0.0.x86_64.replies                 | 25001 ---------------
>  .../caps_4.0.0.x86_64.xml                     |  1398 -
>  .../caps_4.1.0.x86_64.replies                 | 25198 ----------------
>  .../caps_4.1.0.x86_64.xml                     |  1971 --
>  .../caps_4.2.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |     1 -
>  .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |     1 -
>  .../caps_4.2.0.x86_64.xml                     |     1 -
>  .../caps_5.0.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |     1 -
>  .../caps_5.0.0.riscv64.xml                    |     1 -
>  .../caps_5.0.0.x86_64.xml                     |     1 -
>  .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |     1 -
>  .../caps_5.1.0.x86_64.xml                     |     1 -
>  .../caps_5.2.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |     1 -
>  .../caps_5.2.0.riscv64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |     1 -
>  .../caps_5.2.0.x86_64.xml                     |     1 -
>  .../caps_6.0.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |     1 -
>  .../caps_6.0.0.x86_64.xml                     |     1 -
>  .../caps_6.1.0.x86_64.xml                     |     1 -
>  .../caps_6.2.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |     1 -
>  .../caps_6.2.0.x86_64.xml                     |     1 -
>  .../caps_7.0.0.aarch64.xml                    |     1 -
>  .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |     1 -
>  .../caps_7.0.0.x86_64.xml                     |     1 -
>  .../caps_7.1.0.x86_64.xml                     |     1 -
>  .../aarch64-aavmf-virtio-mmio.args            |     2 +-
>  .../aarch64-cpu-passthrough.args              |     2 +-
>  .../aarch64-features-sve.aarch64-4.0.0.err    |     1 -
>  tests/qemuxml2argvdata/aarch64-gic-host.args  |     2 +-
>  .../aarch64-gic-none-tcg.args                 |     2 +-
>  tests/qemuxml2argvdata/aarch64-gic-v2.args    |     2 +-
>  tests/qemuxml2argvdata/aarch64-gic-v3.args    |     2 +-
>  .../aarch64-kvm-32-on-64.args                 |     2 +-
>  .../qemuxml2argvdata/aarch64-pci-serial.args  |     2 +-
>  .../aarch64-traditional-pci.args              |     2 +-
>  .../aarch64-usb-controller-nec-xhci.args      |     2 +-
>  .../aarch64-usb-controller-qemu-xhci.args     |     2 +-
>  .../aarch64-video-default.args                |     4 +-
>  .../aarch64-video-virtio-gpu-pci.args         |     2 +-
>  .../aarch64-virt-2.6-virtio-pci-default.args  |     2 +-
>  .../aarch64-virt-default-nic.args             |     2 +-
>  .../qemuxml2argvdata/aarch64-virt-virtio.args |     2 +-
>  .../aarch64-virtio-pci-default.args           |     2 +-
>  .../aarch64-virtio-pci-manual-addresses.args  |     2 +-
>  tests/qemuxml2argvdata/acpi-table.args        |     2 +-
>  .../arm-vexpressa9-basic.args                 |     2 +-
>  .../arm-vexpressa9-nodevs.args                |     2 +-
>  .../arm-vexpressa9-virtio.args                |     2 +-
>  tests/qemuxml2argvdata/arm-virt-virtio.args   |     2 +-
>  .../audio-alsa-best.x86_64-4.1.0.args         |    46 -
>  .../audio-alsa-full.x86_64-4.1.0.err          |     1 -
>  .../audio-alsa-minimal.x86_64-4.1.0.args      |    33 -
>  .../audio-coreaudio-best.x86_64-4.1.0.args    |    46 -
>  .../audio-coreaudio-full.x86_64-4.1.0.err     |     1 -
>  .../audio-coreaudio-minimal.x86_64-4.1.0.args |    33 -
>  ...audio-default-nographics.x86_64-4.1.0.args |    33 -
>  tests/qemuxml2argvdata/audio-default-sdl.args |     2 +-
>  .../qemuxml2argvdata/audio-default-spice.args |     2 +-
>  tests/qemuxml2argvdata/audio-default-vnc.args |     4 +-
>  .../audio-file-best.x86_64-4.1.0.args         |    45 -
>  .../audio-file-full.x86_64-4.1.0.err          |     1 -
>  .../audio-file-minimal.x86_64-4.1.0.args      |    33 -
>  .../audio-jack-full.x86_64-4.1.0.err          |     1 -
>  .../audio-jack-minimal.x86_64-4.1.0.err       |     1 -
>  .../audio-many-backends.x86_64-4.1.0.err      |     1 -
>  .../audio-none-best.x86_64-4.1.0.args         |    44 -
>  .../audio-none-full.x86_64-4.1.0.err          |     1 -
>  .../audio-none-minimal.x86_64-4.1.0.args      |    33 -
>  .../audio-oss-best.x86_64-4.1.0.args          |    49 -
>  .../audio-oss-full.x86_64-4.1.0.err           |     1 -
>  .../audio-oss-minimal.x86_64-4.1.0.args       |    33 -
>  .../audio-pulseaudio-best.x86_64-4.1.0.args   |    48 -
>  .../audio-pulseaudio-full.x86_64-4.1.0.err    |     1 -
>  ...audio-pulseaudio-minimal.x86_64-4.1.0.args |    33 -
>  .../audio-sdl-best.x86_64-4.1.0.args          |    46 -
>  .../audio-sdl-full.x86_64-4.1.0.err           |     1 -
>  .../audio-sdl-minimal.x86_64-4.1.0.args       |    33 -
>  .../audio-spice-best.x86_64-4.1.0.args        |    45 -
>  .../audio-spice-full.x86_64-4.1.0.err         |     1 -
>  .../audio-spice-minimal.x86_64-4.1.0.args     |    34 -
>  tests/qemuxml2argvdata/autoindex.args         |     2 +-
>  .../qemuxml2argvdata/balloon-ccw-deflate.args |     2 +-
>  .../qemuxml2argvdata/balloon-device-auto.args |     2 +-
>  .../balloon-device-deflate-off.args           |     2 +-
>  .../balloon-device-deflate.args               |     2 +-
>  .../balloon-device-period.args                |     2 +-
>  tests/qemuxml2argvdata/balloon-device.args    |     2 +-
>  .../balloon-mmio-deflate.args                 |     2 +-
>  .../blkdeviotune-group-num.x86_64-4.1.0.args  |    37 -
>  .../blkdeviotune-max-length.x86_64-4.1.0.args |    37 -
>  .../blkdeviotune-max.x86_64-4.1.0.args        |    37 -
>  tests/qemuxml2argvdata/blkiotune-device.args  |     2 +-
>  tests/qemuxml2argvdata/blkiotune.args         |     2 +-
>  tests/qemuxml2argvdata/boot-cdrom.args        |     2 +-
>  tests/qemuxml2argvdata/boot-complex.args      |     2 +-
>  tests/qemuxml2argvdata/boot-floppy-q35.args   |     2 +-
>  tests/qemuxml2argvdata/boot-floppy.args       |     2 +-
>  .../boot-menu-disable-drive.args              |     2 +-
>  tests/qemuxml2argvdata/boot-menu-disable.args |     2 +-
>  .../boot-menu-enable-with-timeout.args        |     2 +-
>  tests/qemuxml2argvdata/boot-menu-enable.args  |     2 +-
>  tests/qemuxml2argvdata/boot-multi.args        |     2 +-
>  tests/qemuxml2argvdata/boot-network.args      |     2 +-
>  tests/qemuxml2argvdata/boot-order.args        |     2 +-
>  tests/qemuxml2argvdata/channel-guestfwd.args  |     2 +-
>  tests/qemuxml2argvdata/channel-spicevmc.args  |     2 +-
>  .../qemuxml2argvdata/channel-virtio-auto.args |     2 +-
>  .../channel-virtio-autoadd.args               |     2 +-
>  .../channel-virtio-autoassign.args            |     2 +-
>  .../channel-virtio-default.args               |     2 +-
>  .../channel-virtio-state.args                 |     2 +-
>  .../qemuxml2argvdata/channel-virtio-unix.args |     2 +-
>  tests/qemuxml2argvdata/channel-virtio.args    |     2 +-
>  tests/qemuxml2argvdata/chardev-reconnect.args |     2 +-
>  tests/qemuxml2argvdata/clock-catchup.args     |     2 +-
>  tests/qemuxml2argvdata/clock-france.args      |     2 +-
>  tests/qemuxml2argvdata/clock-hpet-off.args    |     2 +-
>  .../clock-localtime-basis-localtime.args      |     2 +-
>  tests/qemuxml2argvdata/clock-localtime.args   |     2 +-
>  tests/qemuxml2argvdata/clock-realtime.args    |     2 +-
>  .../clock-timer-hyperv-rtc.args               |     2 +-
>  tests/qemuxml2argvdata/clock-utc.args         |     2 +-
>  tests/qemuxml2argvdata/clock-variable.args    |     2 +-
>  .../qemuxml2argvdata/console-compat-auto.args |     2 +-
>  .../console-compat-chardev.args               |     2 +-
>  tests/qemuxml2argvdata/console-compat.args    |     2 +-
>  .../qemuxml2argvdata/console-virtio-ccw.args  |     2 +-
>  .../qemuxml2argvdata/console-virtio-many.args |     2 +-
>  tests/qemuxml2argvdata/console-virtio.args    |     2 +-
>  tests/qemuxml2argvdata/controller-order.args  |     4 +-
>  tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell.args       |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell2.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-Haswell3.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-cache-disable.args |     2 +-
>  .../qemuxml2argvdata/cpu-cache-disable2.args  |     2 +-
>  .../qemuxml2argvdata/cpu-cache-disable3.args  |     2 +-
>  .../cpu-cache-emulate-l3.args                 |     2 +-
>  .../cpu-cache-passthrough.args                |     2 +-
>  .../cpu-cache-passthrough2.args               |     2 +-
>  .../cpu-check-default-none.args               |     2 +-
>  .../cpu-check-default-none2.args              |     2 +-
>  .../cpu-check-default-partial.args            |     2 +-
>  .../cpu-check-default-partial2.args           |     2 +-
>  tests/qemuxml2argvdata/cpu-check-none.args    |     2 +-
>  tests/qemuxml2argvdata/cpu-exact1.args        |     2 +-
>  .../cpu-exact2-nofallback.args                |     2 +-
>  tests/qemuxml2argvdata/cpu-exact2.args        |     2 +-
>  tests/qemuxml2argvdata/cpu-fallback.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-host-kvmclock.args |     2 +-
>  .../qemuxml2argvdata/cpu-host-model-cmt.args  |     2 +-
>  .../cpu-host-model-cmt.x86_64-4.0.0.args      |    33 -
>  .../cpu-host-model-fallback.args              |     2 +-
>  .../cpu-host-model-vendor.args                |     2 +-
>  tests/qemuxml2argvdata/cpu-host-model.args    |     2 +-
>  .../cpu-host-model.x86_64-3.1.0.args          |    36 -
>  .../cpu-host-model.x86_64-4.0.0.args          |    36 -
>  .../cpu-host-model.x86_64-4.1.0.args          |    36 -
>  .../cpu-host-passthrough-features.args        |     2 +-
>  .../cpu-host-passthrough.args                 |     2 +-
>  .../qemuxml2argvdata/cpu-hotplug-startup.args |     2 +-
>  tests/qemuxml2argvdata/cpu-kvmclock.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-minimum1.args      |     2 +-
>  tests/qemuxml2argvdata/cpu-minimum2.args      |     2 +-
>  .../cpu-no-removed-features.args              |     2 +-
>  tests/qemuxml2argvdata/cpu-numa-disjoint.args |     2 +-
>  .../qemuxml2argvdata/cpu-numa-memshared.args  |     2 +-
>  .../cpu-numa-no-memory-element.args           |     2 +-
>  tests/qemuxml2argvdata/cpu-numa1.args         |     2 +-
>  tests/qemuxml2argvdata/cpu-numa2.args         |     2 +-
>  tests/qemuxml2argvdata/cpu-s390-features.args |     2 +-
>  tests/qemuxml2argvdata/cpu-s390-zEC12.args    |     2 +-
>  tests/qemuxml2argvdata/cpu-strict1.args       |     2 +-
>  tests/qemuxml2argvdata/cpu-topology1.args     |     2 +-
>  tests/qemuxml2argvdata/cpu-topology2.args     |     2 +-
>  tests/qemuxml2argvdata/cpu-topology3.args     |     2 +-
>  tests/qemuxml2argvdata/cpu-tsc-frequency.args |     2 +-
>  .../cpu-tsc-frequency.x86_64-4.0.0.args       |    33 -
>  tests/qemuxml2argvdata/cputune-numatune.args  |     2 +-
>  .../qemuxml2argvdata/cputune-zero-shares.args |     2 +-
>  tests/qemuxml2argvdata/cputune.args           |     2 +-
>  .../default-kvm-host-arch.args                |     2 +-
>  .../default-qemu-host-arch.args               |     2 +-
>  .../disk-aio.x86_64-4.1.0.args                |    36 -
>  .../disk-arm-virtio-sd.aarch64-4.0.0.args     |    38 -
>  ...isk-backing-chains-index.x86_64-4.1.0.args |    45 -
>  ...k-backing-chains-noindex.x86_64-4.1.0.args |     1 -
>  .../disk-cache.x86_64-3.1.0.args              |    42 -
>  .../disk-cache.x86_64-4.1.0.args              |    42 -
>  .../disk-cdrom-network.x86_64-4.1.0.args      |    39 -
>  .../disk-cdrom-tray.x86_64-4.1.0.args         |    38 -
>  .../disk-cdrom.x86_64-4.1.0.args              |    39 -
>  .../disk-copy_on_read.x86_64-4.1.0.args       |    39 -
>  .../disk-detect-zeroes.x86_64-4.1.0.args      |    37 -
>  .../disk-discard.x86_64-4.1.0.args            |    36 -
>  .../disk-error-policy-s390x.s390x-4.0.0.args  |    35 -
>  .../disk-error-policy.x86_64-4.1.0.args       |    37 -
>  .../disk-floppy-q35.x86_64-4.1.0.args         |    36 -
>  .../disk-floppy.x86_64-4.1.0.args             |    37 -
>  .../disk-fmt-qcow.x86_64-4.1.0.args           |    35 -
>  .../disk-network-gluster.x86_64-4.1.0.args    |    37 -
>  .../disk-network-iscsi.x86_64-4.1.0.args      |    49 -
>  .../disk-network-nbd.x86_64-4.1.0.args        |    41 -
>  ...disk-network-rbd-no-colon.x86_64-4.1.0.err |     1 -
>  .../disk-network-rbd.x86_64-4.1.0.args        |    44 -
>  .../disk-network-sheepdog.x86_64-4.1.0.args   |    35 -
>  ...disk-network-source-auth.x86_64-4.1.0.args |    40 -
>  ...disk-network-tlsx509-nbd.x86_64-4.1.0.args |    35 -
>  ...isk-network-tlsx509-vxhs.x86_64-4.1.0.args |    41 -
>  .../disk-readonly-disk.x86_64-4.1.0.args      |    36 -
>  .../disk-shared.x86_64-3.1.0.args             |    41 -
>  .../disk-shared.x86_64-4.1.0.args             |    41 -
>  .../disk-source-pool-mode.x86_64-4.1.0.args   |    40 -
>  .../disk-source-pool.x86_64-4.1.0.args        |    42 -
>  .../disk-transient.x86_64-4.1.0.err           |     1 -
>  ...virtio-scsi-reservations.x86_64-4.1.0.args |    39 -
>  .../encrypted-disk-usage.x86_64-4.1.0.args    |    35 -
>  .../encrypted-disk.x86_64-4.1.0.args          |    35 -
>  .../fd-memory-no-numa-topology.args           |     2 +-
>  .../fd-memory-numa-topology.args              |     2 +-
>  .../fd-memory-numa-topology2.args             |     2 +-
>  .../fd-memory-numa-topology3.args             |     2 +-
>  .../firmware-manual-bios.args                 |     2 +-
>  .../firmware-manual-efi-acpi-aarch64.args     |     2 +-
>  .../firmware-manual-efi-acpi-q35.args         |     2 +-
>  .../firmware-manual-efi-noacpi-aarch64.args   |     2 +-
>  ...l-efi-nvram-network-iscsi.x86_64-4.1.0.err |     1 -
>  .../firmware-manual-efi-secure.args           |     2 +-
>  .../qemuxml2argvdata/firmware-manual-efi.args |     2 +-
>  .../firmware-manual-noefi-acpi-q35.args       |     2 +-
>  .../firmware-manual-noefi-noacpi-aarch64.args |     2 +-
>  .../firmware-manual-noefi-noacpi-q35.args     |     2 +-
>  .../floppy-drive-fat.x86_64-4.1.0.args        |    35 -
>  .../hostdev-mdev-precreated.args              |     2 +-
>  .../hostdev-pci-address-unassigned.args       |     2 +-
>  .../hostdev-pci-multifunction.args            |     2 +-
>  .../hostdev-scsi-lsi.x86_64-4.1.0.args        |    49 -
>  .../hostdev-scsi-vhost-scsi-ccw.args          |     2 +-
>  .../hostdev-scsi-vhost-scsi-pci.args          |     2 +-
>  .../hostdev-scsi-vhost-scsi-pcie.args         |     2 +-
>  ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args |    51 -
>  .../hostdev-subsys-mdev-vfio-ccw.args         |     2 +-
>  .../hostdev-vfio-multidomain.args             |     2 +-
>  .../hostdev-vfio-zpci-autogenerate-fids.args  |     2 +-
>  .../hostdev-vfio-zpci-autogenerate-uids.args  |     2 +-
>  .../hostdev-vfio-zpci-autogenerate.args       |     2 +-
>  .../hostdev-vfio-zpci-boundaries.args         |     2 +-
>  .../hostdev-vfio-zpci-ccw-memballoon.args     |     2 +-
>  .../hostdev-vfio-zpci-multidomain-many.args   |     2 +-
>  tests/qemuxml2argvdata/hostdev-vfio-zpci.args |     2 +-
>  tests/qemuxml2argvdata/hostdev-vfio.args      |     2 +-
>  tests/qemuxml2argvdata/hotplug-base.args      |     2 +-
>  .../hugepages-default-2M.args                 |     2 +-
>  .../hugepages-default-system-size.args        |     2 +-
>  tests/qemuxml2argvdata/hugepages-default.args |     2 +-
>  .../qemuxml2argvdata/hugepages-memaccess.args |     2 +-
>  .../hugepages-memaccess2.args                 |     2 +-
>  tests/qemuxml2argvdata/hugepages-nodeset.args |     2 +-
>  .../hugepages-numa-default-2M.args            |     2 +-
>  .../hugepages-numa-default-dimm.args          |     2 +-
>  .../hugepages-numa-default.args               |     2 +-
>  .../hugepages-numa-nodeset-part.args          |     2 +-
>  .../hugepages-numa-nodeset.args               |     2 +-
>  tests/qemuxml2argvdata/hugepages-shared.args  |     2 +-
>  .../hvf-aarch64-virt-headless.args            |     2 +-
>  .../hvf-x86_64-q35-headless.args              |     2 +-
>  .../qemuxml2argvdata/input-usbmouse-addr.args |     2 +-
>  tests/qemuxml2argvdata/input-usbmouse.args    |     2 +-
>  tests/qemuxml2argvdata/input-usbtablet.args   |     2 +-
>  tests/qemuxml2argvdata/input-virtio-ccw.args  |     2 +-
>  .../iothreads-disk-virtio-ccw.args            |     2 +-
>  tests/qemuxml2argvdata/iothreads-disk.args    |     2 +-
>  .../iothreads-ids-partial.args                |     2 +-
>  tests/qemuxml2argvdata/iothreads-ids.args     |     2 +-
>  tests/qemuxml2argvdata/iothreads.args         |     2 +-
>  tests/qemuxml2argvdata/kvm-features-off.args  |     2 +-
>  tests/qemuxml2argvdata/kvm-features.args      |     2 +-
>  tests/qemuxml2argvdata/kvm-pit-delay.args     |     2 +-
>  tests/qemuxml2argvdata/kvm-pit-discard.args   |     2 +-
>  tests/qemuxml2argvdata/kvmclock.args          |     2 +-
>  .../luks-disks-source.x86_64-4.1.0.args       |    48 -
>  .../luks-disks.x86_64-4.1.0.args              |    39 -
>  .../mach-virt-console-virtio.args             |     2 +-
>  .../mach-virt-serial-native.args              |     2 +-
>  .../mach-virt-serial-pci.args                 |     2 +-
>  .../mach-virt-serial-usb.args                 |     2 +-
>  .../machine-aeskeywrap-off-cap.args           |     2 +-
>  .../machine-aeskeywrap-off-caps.args          |     2 +-
>  .../machine-aeskeywrap-on-cap.args            |     2 +-
>  .../machine-aeskeywrap-on-caps.args           |     2 +-
>  tests/qemuxml2argvdata/machine-aliases1.args  |     2 +-
>  tests/qemuxml2argvdata/machine-aliases2.args  |     2 +-
>  tests/qemuxml2argvdata/machine-core-off.args  |     2 +-
>  tests/qemuxml2argvdata/machine-core-on.args   |     2 +-
>  .../machine-deakeywrap-off-cap.args           |     2 +-
>  .../machine-deakeywrap-off-caps.args          |     2 +-
>  .../machine-deakeywrap-on-cap.args            |     2 +-
>  .../machine-deakeywrap-on-caps.args           |     2 +-
>  .../machine-keywrap-none-caps.args            |     2 +-
>  .../machine-keywrap-none.args                 |     2 +-
>  ...ine-loadparm-multiple-disks-nets-s390.args |     2 +-
>  .../machine-loadparm-net-s390.args            |     2 +-
>  .../machine-loadparm-s390.args                |     2 +-
>  .../qemuxml2argvdata/machine-vmport-opt.args  |     2 +-
>  tests/qemuxml2argvdata/master-key.args        |     2 +-
>  .../memory-hotplug-dimm-addr.args             |     2 +-
>  .../qemuxml2argvdata/memory-hotplug-dimm.args |     2 +-
>  ...emory-hotplug-nvdimm-ppc64-abi-update.args |     2 +-
>  .../memory-hotplug-nvdimm-ppc64.args          |     2 +-
>  ...emory-hotplug-ppc64-nonuma-abi-update.args |     2 +-
>  .../memory-hotplug-ppc64-nonuma.args          |     2 +-
>  tests/qemuxml2argvdata/memory-hotplug.args    |     2 +-
>  tests/qemuxml2argvdata/memtune-unlimited.args |     2 +-
>  tests/qemuxml2argvdata/memtune.args           |     2 +-
>  .../migrate-numa-unaligned.args               |     2 +-
>  tests/qemuxml2argvdata/migrate.args           |     2 +-
>  tests/qemuxml2argvdata/minimal.args           |     2 +-
>  tests/qemuxml2argvdata/misc-acpi.args         |     2 +-
>  tests/qemuxml2argvdata/misc-disable-s3.args   |     2 +-
>  .../misc-disable-suspends.args                |     2 +-
>  tests/qemuxml2argvdata/misc-enable-s4.args    |     2 +-
>  tests/qemuxml2argvdata/misc-uuid.args         |     2 +-
>  tests/qemuxml2argvdata/monitor-json.args      |     2 +-
>  .../multifunction-pci-device.args             |     2 +-
>  tests/qemuxml2argvdata/net-client.args        |     2 +-
>  tests/qemuxml2argvdata/net-eth-hostip.args    |     2 +-
>  tests/qemuxml2argvdata/net-eth-ifname.args    |     2 +-
>  tests/qemuxml2argvdata/net-eth-names.args     |     2 +-
>  .../net-eth-unmanaged-tap.args                |     2 +-
>  tests/qemuxml2argvdata/net-eth.args           |     2 +-
>  .../net-hostdev-bootorder.args                |     2 +-
>  .../net-hostdev-multidomain.args              |     2 +-
>  .../net-hostdev-vfio-multidomain.args         |     2 +-
>  tests/qemuxml2argvdata/net-hostdev-vfio.args  |     2 +-
>  tests/qemuxml2argvdata/net-hostdev.args       |     2 +-
>  tests/qemuxml2argvdata/net-many-models.args   |     2 +-
>  tests/qemuxml2argvdata/net-mcast.args         |     2 +-
>  tests/qemuxml2argvdata/net-server.args        |     2 +-
>  tests/qemuxml2argvdata/net-udp.args           |     2 +-
>  tests/qemuxml2argvdata/net-user-addr.args     |     2 +-
>  tests/qemuxml2argvdata/net-user.args          |     2 +-
>  .../net-vhostuser-multiq.args                 |     2 +-
>  tests/qemuxml2argvdata/net-vhostuser.args     |     2 +-
>  tests/qemuxml2argvdata/net-virtio-ccw.args    |     2 +-
>  tests/qemuxml2argvdata/net-virtio-device.args |     2 +-
>  .../net-virtio-disable-offloads.args          |     2 +-
>  tests/qemuxml2argvdata/net-virtio-netdev.args |     2 +-
>  .../net-virtio-rxtxqueuesize.args             |     2 +-
>  .../net-virtio-teaming-hostdev.args           |     2 +-
>  .../qemuxml2argvdata/net-virtio-teaming.args  |     2 +-
>  tests/qemuxml2argvdata/net-virtio.args        |     2 +-
>  tests/qemuxml2argvdata/nosharepages.args      |     2 +-
>  .../numad-auto-memory-vcpu-cpuset.args        |     2 +-
>  ...o-memory-vcpu-no-cpuset-and-placement.args |     2 +-
>  .../numad-auto-vcpu-static-numatune.args      |     2 +-
>  .../numad-static-memory-auto-vcpu.args        |     2 +-
>  tests/qemuxml2argvdata/numad.args             |     2 +-
>  .../numatune-auto-nodeset-invalid.args        |     2 +-
>  .../numatune-auto-prefer.args                 |     2 +-
>  .../qemuxml2argvdata/numatune-distances.args  |     2 +-
>  .../numatune-memnode-no-memory.args           |     2 +-
>  tests/qemuxml2argvdata/numatune-memnode.args  |     2 +-
>  tests/qemuxml2argvdata/numatune-memory.args   |     2 +-
>  tests/qemuxml2argvdata/numatune-no-vcpu.args  |     2 +-
>  .../qemuxml2argvdata/pages-dimm-discard.args  |     2 +-
>  .../pages-discard-hugepages.args              |     2 +-
>  tests/qemuxml2argvdata/pages-discard.args     |     2 +-
>  .../parallel-parport-chardev.args             |     2 +-
>  .../parallel-tcp-chardev.args                 |     2 +-
>  tests/qemuxml2argvdata/pci-autoadd-addr.args  |     2 +-
>  tests/qemuxml2argvdata/pci-autoadd-idx.args   |     2 +-
>  tests/qemuxml2argvdata/pci-autofill-addr.args |     2 +-
>  .../pci-bridge-many-disks.args                |     2 +-
>  tests/qemuxml2argvdata/pci-bridge.args        |     4 +-
>  tests/qemuxml2argvdata/pci-expander-bus.args  |     2 +-
>  tests/qemuxml2argvdata/pci-many.args          |     2 +-
>  tests/qemuxml2argvdata/pci-rom-disabled.args  |     2 +-
>  tests/qemuxml2argvdata/pci-rom.args           |     2 +-
>  .../pci-serial-dev-chardev.args               |     2 +-
>  tests/qemuxml2argvdata/pcie-expander-bus.args |     2 +-
>  .../pcie-root-port-model-generic.args         |     2 +-
>  .../pcie-root-port-model-ioh3420.args         |     2 +-
>  tests/qemuxml2argvdata/pcie-root-port.args    |     2 +-
>  tests/qemuxml2argvdata/pcie-root.args         |     2 +-
>  .../pcie-switch-downstream-port.args          |     2 +-
>  .../pcie-switch-upstream-port.args            |     2 +-
>  tests/qemuxml2argvdata/pcihole64-q35.args     |     2 +-
>  tests/qemuxml2argvdata/pcihole64.args         |     2 +-
>  tests/qemuxml2argvdata/pmu-feature-off.args   |     2 +-
>  tests/qemuxml2argvdata/pmu-feature.args       |     2 +-
>  tests/qemuxml2argvdata/ppc-dtb.args           |     2 +-
>  .../ppc64-usb-controller-legacy.args          |     2 +-
>  .../ppc64-usb-controller-qemu-xhci.args       |     2 +-
>  .../ppc64-usb-controller.args                 |     2 +-
>  tests/qemuxml2argvdata/ppce500-serial.args    |     2 +-
>  tests/qemuxml2argvdata/pseries-basic.args     |     2 +-
>  .../pseries-console-virtio.args               |     2 +-
>  .../qemuxml2argvdata/pseries-cpu-compat.args  |     2 +-
>  tests/qemuxml2argvdata/pseries-cpu-exact.args |     2 +-
>  tests/qemuxml2argvdata/pseries-cpu-le.args    |     2 +-
>  tests/qemuxml2argvdata/pseries-features.args  |     2 +-
>  .../qemuxml2argvdata/pseries-hostdevs-1.args  |     2 +-
>  .../qemuxml2argvdata/pseries-hostdevs-2.args  |     2 +-
>  .../qemuxml2argvdata/pseries-hostdevs-3.args  |     2 +-
>  .../pseries-many-buses-1.args                 |     2 +-
>  .../pseries-many-buses-2.args                 |     2 +-
>  .../pseries-many-devices.args                 |     2 +-
>  tests/qemuxml2argvdata/pseries-nvram.args     |     2 +-
>  .../pseries-panic-missing.args                |     2 +-
>  .../pseries-panic-no-address.args             |     2 +-
>  .../pseries-phb-default-missing.args          |     2 +-
>  .../pseries-phb-numa-node.args                |     2 +-
>  .../qemuxml2argvdata/pseries-phb-simple.args  |     2 +-
>  .../pseries-serial-native.args                |     2 +-
>  .../qemuxml2argvdata/pseries-serial-pci.args  |     2 +-
>  .../qemuxml2argvdata/pseries-serial-usb.args  |     2 +-
>  .../qemuxml2argvdata/pseries-usb-default.args |     2 +-
>  tests/qemuxml2argvdata/pseries-usb-kbd.args   |     2 +-
>  tests/qemuxml2argvdata/pseries-usb-multi.args |     2 +-
>  .../pseries-vio-user-assigned.args            |     2 +-
>  tests/qemuxml2argvdata/pseries-vio.args       |     2 +-
>  .../q35-default-devices-only.args             |     2 +-
>  tests/qemuxml2argvdata/q35-multifunction.args |     2 +-
>  .../q35-pci-force-address.args                |     4 +-
>  tests/qemuxml2argvdata/q35-pcie-autoadd.args  |     2 +-
>  tests/qemuxml2argvdata/q35-pcie.args          |     2 +-
>  .../q35-pm-disable-fallback.args              |     2 +-
>  tests/qemuxml2argvdata/q35-pm-disable.args    |     2 +-
>  tests/qemuxml2argvdata/q35-usb2-multi.args    |     2 +-
>  tests/qemuxml2argvdata/q35-usb2-reorder.args  |     2 +-
>  tests/qemuxml2argvdata/q35-usb2.args          |     2 +-
>  .../q35-virt-manager-basic.args               |     4 +-
>  tests/qemuxml2argvdata/q35-virtio-pci.args    |     2 +-
>  tests/qemuxml2argvdata/q35.args               |     2 +-
>  tests/qemuxml2argvdata/qemu-ns-alt.args       |     2 +-
>  .../qemu-ns-commandline-ns0.args              |     2 +-
>  .../qemu-ns-commandline-ns1.args              |     2 +-
>  .../qemuxml2argvdata/qemu-ns-commandline.args |     2 +-
>  .../qemu-ns-domain-commandline-ns0.args       |     2 +-
>  .../qemu-ns-domain-commandline.args           |     2 +-
>  .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |     2 +-
>  tests/qemuxml2argvdata/qemu-ns-no-env.args    |     2 +-
>  .../reboot-timeout-disabled.args              |     2 +-
>  .../reboot-timeout-enabled.args               |     2 +-
>  tests/qemuxml2argvdata/restore-v2-fd.args     |     2 +-
>  tests/qemuxml2argvdata/restore-v2.args        |     2 +-
>  tests/qemuxml2argvdata/riscv64-virt-pci.args  |     2 +-
>  tests/qemuxml2argvdata/riscv64-virt.args      |     2 +-
>  .../qemuxml2argvdata/s390-panic-missing.args  |     2 +-
>  .../s390-panic-no-address.args                |     2 +-
>  tests/qemuxml2argvdata/s390-serial-2.args     |     2 +-
>  .../qemuxml2argvdata/s390-serial-console.args |     2 +-
>  tests/qemuxml2argvdata/s390-serial.args       |     2 +-
>  tests/qemuxml2argvdata/seclabel-dac-none.args |     2 +-
>  .../seclabel-dynamic-baselabel.args           |     2 +-
>  .../seclabel-dynamic-labelskip.args           |     2 +-
>  .../seclabel-dynamic-override.args            |     2 +-
>  .../seclabel-dynamic-relabel.args             |     2 +-
>  tests/qemuxml2argvdata/seclabel-dynamic.args  |     2 +-
>  tests/qemuxml2argvdata/seclabel-none.args     |     2 +-
>  .../seclabel-static-labelskip.args            |     2 +-
>  .../seclabel-static-relabel.args              |     2 +-
>  tests/qemuxml2argvdata/seclabel-static.args   |     2 +-
>  .../serial-dev-chardev-iobase.args            |     2 +-
>  .../qemuxml2argvdata/serial-dev-chardev.args  |     2 +-
>  .../qemuxml2argvdata/serial-file-chardev.args |     2 +-
>  tests/qemuxml2argvdata/serial-file-log.args   |     2 +-
>  .../qemuxml2argvdata/serial-many-chardev.args |     2 +-
>  .../qemuxml2argvdata/serial-pty-chardev.args  |     2 +-
>  tests/qemuxml2argvdata/serial-spiceport.args  |     2 +-
>  .../qemuxml2argvdata/serial-tcp-chardev.args  |     2 +-
>  .../serial-tcp-telnet-chardev.args            |     2 +-
>  .../serial-tcp-tlsx509-chardev-notls.args     |     2 +-
>  .../serial-tcp-tlsx509-chardev-verify.args    |     2 +-
>  .../serial-tcp-tlsx509-chardev.args           |     2 +-
>  .../serial-tcp-tlsx509-secret-chardev.args    |     2 +-
>  .../qemuxml2argvdata/serial-udp-chardev.args  |     2 +-
>  .../qemuxml2argvdata/serial-unix-chardev.args |     2 +-
>  tests/qemuxml2argvdata/serial-vc-chardev.args |     2 +-
>  .../shmem-plain-doorbell.args                 |     2 +-
>  tests/qemuxml2argvdata/shmem.args             |     2 +-
>  .../smartcard-controller.args                 |     2 +-
>  .../smartcard-host-certificates-database.args |     2 +-
>  .../smartcard-host-certificates.args          |     2 +-
>  tests/qemuxml2argvdata/smartcard-host.args    |     2 +-
>  .../smartcard-passthrough-spicevmc.args       |     2 +-
>  .../smartcard-passthrough-tcp.args            |     2 +-
>  tests/qemuxml2argvdata/smbios-type-fwcfg.args |     2 +-
>  tests/qemuxml2argvdata/smbios.args            |     2 +-
>  tests/qemuxml2argvdata/smp-dies.args          |     2 +-
>  tests/qemuxml2argvdata/smp.args               |     2 +-
>  tests/qemuxml2argvdata/sound-device.args      |    26 +-
>  tests/qemuxml2argvdata/sound.args             |     8 +-
>  tests/qemuxml2argvdata/sparc-minimal.args     |     2 +-
>  .../usb-controller-default-q35.args           |     2 +-
>  .../usb-controller-explicit-q35.args          |     2 +-
>  .../usb-controller-qemu-xhci.args             |     2 +-
>  .../qemuxml2argvdata/usb-controller-xhci.args |     2 +-
>  tests/qemuxml2argvdata/usb-controller.args    |     2 +-
>  .../usb-hub-autoadd-deluxe.args               |     2 +-
>  tests/qemuxml2argvdata/usb-hub-autoadd.args   |     2 +-
>  tests/qemuxml2argvdata/usb-hub.args           |     2 +-
>  .../qemuxml2argvdata/usb-ich9-autoassign.args |     2 +-
>  .../qemuxml2argvdata/usb-ich9-companion.args  |     2 +-
>  .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |     2 +-
>  .../qemuxml2argvdata/usb-long-port-path.args  |     2 +-
>  tests/qemuxml2argvdata/usb-none.args          |     2 +-
>  .../usb-piix3-controller.args                 |     2 +-
>  .../qemuxml2argvdata/usb-port-autoassign.args |     2 +-
>  tests/qemuxml2argvdata/usb-port-missing.args  |     2 +-
>  tests/qemuxml2argvdata/usb-ports.args         |     2 +-
>  tests/qemuxml2argvdata/usb-redir-boot.args    |     2 +-
>  .../usb-redir-filter-version.args             |     2 +-
>  tests/qemuxml2argvdata/usb-redir-filter.args  |     2 +-
>  tests/qemuxml2argvdata/usb-redir.args         |     2 +-
>  .../qemuxml2argvdata/usb-xhci-autoassign.args |     2 +-
>  tests/qemuxml2argvdata/usb1-usb2.args         |     2 +-
>  tests/qemuxml2argvdata/user-aliases-usb.args  |     2 +-
>  tests/qemuxml2argvdata/user-aliases.args      |     6 +-
>  .../vcpu-placement-static.args                |     2 +-
>  .../video-device-pciaddr-default.args         |     4 +-
>  tests/qemuxml2argvdata/video-none-device.args |     4 +-
>  .../video-qxl-device-vgamem.args              |     2 +-
>  tests/qemuxml2argvdata/video-qxl-device.args  |     2 +-
>  tests/qemuxml2argvdata/video-qxl-heads.args   |     2 +-
>  tests/qemuxml2argvdata/video-qxl-noheads.args |     2 +-
>  .../video-qxl-resolution.args                 |     2 +-
>  .../video-qxl-sec-device-vgamem.args          |     2 +-
>  .../video-qxl-sec-device.args                 |     2 +-
>  .../video-vga-device-vgamem.args              |     2 +-
>  tests/qemuxml2argvdata/video-vga-device.args  |     2 +-
>  .../qemuxml2argvdata/video-vga-qxl-heads.args |     2 +-
>  .../video-virtio-gpu-ccw.args                 |     4 +-
>  .../video-virtio-gpu-device.args              |     2 +-
>  .../video-virtio-gpu-secondary.args           |     2 +-
>  .../video-virtio-gpu-spice-gl.args            |     2 +-
>  .../video-virtio-gpu-virgl.args               |     2 +-
>  tests/qemuxml2argvdata/video-virtio-vga.args  |     2 +-
>  .../virtio-input-passthrough.args             |     2 +-
>  tests/qemuxml2argvdata/virtio-input.args      |     2 +-
>  .../virtio-non-transitional.x86_64-3.1.0.args |    53 -
>  tests/qemuxml2argvdata/virtio-rng-ccw.args    |     2 +-
>  .../qemuxml2argvdata/virtio-rng-default.args  |     2 +-
>  tests/qemuxml2argvdata/virtio-rng-egd.args    |     2 +-
>  .../qemuxml2argvdata/virtio-rng-multiple.args |     2 +-
>  tests/qemuxml2argvdata/virtio-rng-random.args |     2 +-
>  .../virtio-transitional.x86_64-3.1.0.args     |    46 -
>  tests/qemuxml2argvdata/vmcoreinfo.args        |     2 +-
>  .../x86-kvm-32-on-64.x86_64-4.1.0.args        |    31 -
>  tests/qemuxml2argvtest.c                      |    93 +-
>  .../x86-kvm-32-on-64.x86_64-4.1.0.xml         |    24 -
>  tests/qemuxml2xmltest.c                       |    21 +-
>  590 files changed, 495 insertions(+), 218552 deletions(-)
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
>  delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
>  delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
>  delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
>  delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
>  delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
>  delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
>  delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
> 


From mprivozn at redhat.com  Fri Jul 15 12:03:45 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 15 Jul 2022 14:03:45 +0200
Subject: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to
 qemu-4.2 (part 1)
In-Reply-To: <e42b3483-c86c-b463-be25-30a1e6488c07@suse.de>
References: <cover.1657884290.git.pkrempa@redhat.com>
 <e42b3483-c86c-b463-be25-30a1e6488c07@suse.de>
Message-ID: <ca16f165-5cf6-2507-3cc6-b0f26c5ba6f8@redhat.com>

On 7/15/22 13:54, Claudio Fontana wrote:
> Hello Peter,
> 
> can we retire as well support for migration_set_speed then?
> 
> The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are overcomplicating qemu_migration.c and qemu_driver.c in my view.

While there are only a few such branches, I believe we can do that, but
in a separate commit/series since QEMU docs claim this was introduced in
2.8.

qapi/migration.json:

# @max-bandwidth: to set maximum speed for migration. maximum speed in
#                 bytes per second. (Since 2.8)


Michal


From pkrempa at redhat.com  Fri Jul 15 12:18:53 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:18:53 +0200
Subject: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to
 qemu-4.2 (part 1)
In-Reply-To: <e42b3483-c86c-b463-be25-30a1e6488c07@suse.de>
References: <cover.1657884290.git.pkrempa@redhat.com>
 <e42b3483-c86c-b463-be25-30a1e6488c07@suse.de>
Message-ID: <YtFbLUl/DzTQbWJo@angien.pipo.sk>

On Fri, Jul 15, 2022 at 13:54:26 +0200, Claudio Fontana wrote:
> Hello Peter,
> 
> can we retire as well support for migration_set_speed then?
> 
> The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are overcomplicating qemu_migration.c and qemu_driver.c in my view.

Indeed. I've noticed multiple qemu params which can be assumed (e.g. the
speed parameter is in starting with qemu-2.8).

I'll post patches very shortly.

From pkrempa at redhat.com  Fri Jul 15 12:31:35 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:35 +0200
Subject: [PATCH 0/7] qemu: Remove unused code for tuning migration parameters
Message-ID: <cover.1657888221.git.pkrempa@redhat.com>

All qemu versions supported by libvirt allow setting everything via
migration parameters which is also the preferred code path in libvirt.

Remove the legacy code.

Peter Krempa (7):
  qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
  qemu: capabilities: Retire QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
  qemu: driver: Always assume support for
    QEMU_CAPS_MIGRATION_PARAM_DOWNTIME
  qemu: capabilties: Retire QEMU_CAPS_MIGRATION_PARAM_DOWNTIME
  qemu: Always assume support for
    QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE
  qemu: capabilities: Retire QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE
  qemu: monitor: Remove unused migration property getters/setters

 src/qemu/qemu_capabilities.c                  |   9 +-
 src/qemu/qemu_capabilities.h                  |   6 +-
 src/qemu/qemu_driver.c                        | 125 ++++++------------
 src/qemu/qemu_migration.c                     |  53 +++-----
 src/qemu/qemu_migration_params.c              |  18 ---
 src/qemu/qemu_monitor.c                       |  55 --------
 src/qemu/qemu_monitor.h                       |  11 --
 src/qemu/qemu_monitor_json.c                  |  96 --------------
 src/qemu/qemu_monitor_json.h                  |  15 ---
 .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |   3 -
 .../caps_3.1.0.x86_64.xml                     |   3 -
 .../caps_4.0.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |   3 -
 .../caps_4.0.0.riscv32.xml                    |   3 -
 .../caps_4.0.0.riscv64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |   3 -
 .../caps_4.0.0.x86_64.xml                     |   3 -
 .../caps_4.1.0.x86_64.xml                     |   3 -
 .../caps_4.2.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |   3 -
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |   3 -
 .../caps_4.2.0.x86_64.xml                     |   3 -
 .../caps_5.0.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |   3 -
 .../caps_5.0.0.riscv64.xml                    |   3 -
 .../caps_5.0.0.x86_64.xml                     |   3 -
 .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |   3 -
 .../caps_5.1.0.x86_64.xml                     |   3 -
 .../caps_5.2.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |   3 -
 .../caps_5.2.0.riscv64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |   3 -
 .../caps_5.2.0.x86_64.xml                     |   3 -
 .../caps_6.0.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |   3 -
 .../caps_6.0.0.x86_64.xml                     |   3 -
 .../caps_6.1.0.x86_64.xml                     |   3 -
 .../caps_6.2.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |   3 -
 .../caps_6.2.0.x86_64.xml                     |   3 -
 .../caps_7.0.0.aarch64.xml                    |   3 -
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |   3 -
 .../caps_7.0.0.x86_64.xml                     |   3 -
 .../caps_7.1.0.x86_64.xml                     |   3 -
 tests/qemumonitorjsontest.c                   |  39 ------
 45 files changed, 59 insertions(+), 473 deletions(-)

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:36 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:36 +0200
Subject: [PATCH 1/7] qemu: Always assume support for
 QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <7512fc37a06666da2e4c5f59b90f85820491bf8f.1657888221.git.pkrempa@redhat.com>

The 'max-bandwidth' field was added as argument of
'migrate-set-parameters' in qemu-2.8, thus all qemu version supported by
libvirt already use the new code path.

This patch assumes the presence and removes the legacy code paths.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c    | 39 ++++++++++------------------
 src/qemu/qemu_migration.c | 53 +++++++++++----------------------------
 2 files changed, 28 insertions(+), 64 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index da95f947e7..a632945146 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13304,7 +13304,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
     qemuDomainObjPrivate *priv;
     bool postcopy = !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY);
     g_autoptr(qemuMigrationParams) migParams = NULL;
-    bool bwParam;
+    qemuMigrationParam param;
     unsigned long long max;
     int ret = -1;

@@ -13343,35 +13343,22 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,

     VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth);

-    bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);

-    if (postcopy || bwParam) {
-        qemuMigrationParam param;
-
-        if (!(migParams = qemuMigrationParamsNew()))
-            goto endjob;
-
-        if (postcopy)
-            param = QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH;
-        else
-            param = QEMU_MIGRATION_PARAM_MAX_BANDWIDTH;
+    if (!(migParams = qemuMigrationParamsNew()))
+        goto endjob;

-        if (qemuMigrationParamsSetULL(migParams, param,
-                                      bandwidth * 1024 * 1024) < 0)
-            goto endjob;
+    if (postcopy)
+        param = QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH;
+    else
+        param = QEMU_MIGRATION_PARAM_MAX_BANDWIDTH;

-        if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
-                                     migParams, 0) < 0)
-            goto endjob;
-    } else {
-        int rc;
+    if (qemuMigrationParamsSetULL(migParams, param,
+                                  bandwidth * 1024 * 1024) < 0)
+        goto endjob;

-        qemuDomainObjEnterMonitor(driver, vm);
-        rc = qemuMonitorSetMigrationSpeed(priv->mon, bandwidth);
-        qemuDomainObjExitMonitor(vm);
-        if (rc < 0)
-            goto endjob;
-    }
+    if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
+                                 migParams, 0) < 0)
+        goto endjob;

     if (!postcopy)
         priv->migMaxBandwidth = bandwidth;
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 9c3fd41761..b12cb518ee 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4697,7 +4697,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
     virErrorPtr orig_err = NULL;
     unsigned int cookieFlags = 0;
     bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
-    bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
     bool storageMigration = flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC);
     bool cancel = false;
     unsigned int waitFlags;
@@ -4795,8 +4794,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
             goto error;
     }

-    if (bwParam &&
-        qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
+    if (qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
                                   priv->migMaxBandwidth * 1024 * 1024) < 0)
         goto error;

@@ -4887,10 +4885,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
         goto exit_monitor;
     }

-    if (!bwParam &&
-        qemuMonitorSetMigrationSpeed(priv->mon, priv->migMaxBandwidth) < 0)
-        goto exit_monitor;
-
     rc = qemuMigrationSrcStart(vm, spec, migrate_flags, &fd);

     qemuDomainObjExitMonitor(vm);
@@ -6880,7 +6874,6 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
                        virDomainAsyncJob asyncJob)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
     int rc;
     int ret = -1;
     int pipeFD[2] = { -1, -1 };
@@ -6894,27 +6887,18 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,

     /* Increase migration bandwidth to unlimited since target is a file.
      * Failure to change migration speed is not fatal. */
-    if (bwParam) {
-        if (!(migParams = qemuMigrationParamsNew()))
-            return -1;
+    if (!(migParams = qemuMigrationParamsNew()))
+        return -1;

-        if (qemuMigrationParamsSetULL(migParams,
-                                      QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
-                                      QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024 * 1024) < 0)
-            return -1;
+    if (qemuMigrationParamsSetULL(migParams,
+                                  QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
+                                  QEMU_DOMAIN_MIG_BANDWIDTH_MAX * 1024 * 1024) < 0)
+        return -1;

-        if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) < 0)
-            return -1;
+    if (qemuMigrationParamsApply(driver, vm, asyncJob, migParams, 0) < 0)
+        return -1;

-        priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
-    } else {
-        if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
-            qemuMonitorSetMigrationSpeed(priv->mon,
-                                         QEMU_DOMAIN_MIG_BANDWIDTH_MAX);
-            priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
-            qemuDomainObjExitMonitor(vm);
-        }
-    }
+    priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;

     if (!virDomainObjIsActive(vm)) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -6994,18 +6978,11 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,

     /* Restore max migration bandwidth */
     if (virDomainObjIsActive(vm)) {
-        if (bwParam) {
-            if (qemuMigrationParamsSetULL(migParams,
-                                          QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
-                                          saveMigBandwidth * 1024 * 1024) == 0)
-                ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob,
-                                                      migParams, 0));
-        } else {
-            if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
-                qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth);
-                qemuDomainObjExitMonitor(vm);
-            }
-        }
+        if (qemuMigrationParamsSetULL(migParams,
+                                      QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
+                                      saveMigBandwidth * 1024 * 1024) == 0)
+            ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob,
+                                                  migParams, 0));
         priv->migMaxBandwidth = saveMigBandwidth;
     }

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:37 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:37 +0200
Subject: [PATCH 2/7] qemu: capabilities: Retire
 QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <af57f8ea8b4136803ceb20a5f817b725eb498a1e.1657888221.git.pkrempa@redhat.com>

The parameter is supported since qemu-2.8.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 37 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index fa8ffd19ca..2bce58e5c4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -587,7 +587,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "cpu.migratable", /* QEMU_CAPS_CPU_MIGRATABLE */
               "query-cpu-model-expansion.migratable", /* X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */
               "fw_cfg", /* X_QEMU_CAPS_FW_CFG */
-              "migration-param.bandwidth", /* QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH */
+              "migration-param.bandwidth", /* X_QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH */
               "migration-param.downtime", /* QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */

               /* 375 */
@@ -1604,7 +1604,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARDEV_FILE_APPEND },
     { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
     { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
-    { "migrate-set-parameters/arg-type/max-bandwidth", QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH },
     { "migrate-set-parameters/arg-type/downtime-limit", QEMU_CAPS_MIGRATION_PARAM_DOWNTIME },
     { "migrate-set-parameters/arg-type/xbzrle-cache-size", QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE },
     { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a409c1272c..720bc6ced8 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -566,7 +566,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_CPU_MIGRATABLE, /* -cpu ...,migratable=on|off */
     X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */
     X_QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */
-    QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
+    X_QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
     QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */

     /* 375 */
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index cc6e75884b..1b5263622f 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -126,7 +126,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index 27be36f0ab..dd19d09052 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -169,7 +169,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 7e0b8fbddf..718823a121 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -135,7 +135,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 19bbbd1de3..7f92dbdbe8 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -140,7 +140,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index ef6f04f54b..0594b5744f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -133,7 +133,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 7c65aff290..882b7801e3 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -133,7 +133,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 9b5ed96ba3..7feb9a520f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -104,7 +104,6 @@
   <flag name='query-cpu-model-comparison'/>
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 3cf6a66389..3b33ec749c 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -174,7 +174,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 5daa7bda75..b465e1f239 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -180,7 +180,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 875e491581..0694375df6 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -147,7 +147,6 @@
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 428ecd4f42..017203a293 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -145,7 +145,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 725745593c..613a581a3c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -114,7 +114,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 6a54c44d79..d7da79c79f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -188,7 +188,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 35998cabf0..8dc04ff823 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index b8ddf2e9a8..12425b005e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -161,7 +161,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c49c258255..40ef19ef00 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -149,7 +149,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index ce297f2ef5..10c2e4af8e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -194,7 +194,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index e6a3ed5ec0..771cb541fb 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -72,7 +72,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a49650cbcc..302daeede8 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 42a4418a08..0163b78fe6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index d0dd058743..1c0dd5281a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -159,7 +159,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 25339f86d9..9cda765cf7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -147,7 +147,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 30d10236e9..edf8bed66d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -117,7 +117,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4ff03dbead..e6e0f42f19 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 2d861da97b..1def558aad 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 06543071aa..40c7e1fa91 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -116,7 +116,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 38acee5f18..dd51d9eae0 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index b03c6bfc24..1f88a3a8b5 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 942c0ba169..9d283e2b29 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -165,7 +165,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 983b54430d..b7eabcf2f3 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -158,7 +158,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 32f226acbd..1658bc8cb1 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index f4d7cbdd10..869c3074ad 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -166,7 +166,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 2f895294de..d0a132ee2f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -168,7 +168,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 17ea778d38..7254d0dc70 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 5f5c839fea..d13ed637b6 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.bandwidth'/>
   <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:38 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:38 +0200
Subject: [PATCH 3/7] qemu: driver: Always assume support for
 QEMU_CAPS_MIGRATION_PARAM_DOWNTIME
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <4d9870e26452d3baa7e2ba0424cb0b6e07768c41.1657888221.git.pkrempa@redhat.com>

The 'downtime-limit' field of 'migrate-set-parameters' was introduced in
qemu-2.8, thus all qemu versions supported by libvirt use the new code.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index a632945146..0a5239e136 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13059,10 +13059,8 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
 {
     virQEMUDriver *driver = dom->conn->privateData;
     virDomainObj *vm;
-    qemuDomainObjPrivate *priv;
     g_autoptr(qemuMigrationParams) migParams = NULL;
     int ret = -1;
-    int rc;

     virCheckFlags(0, -1);

@@ -13078,29 +13076,19 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    priv = vm->privateData;
-
     VIR_DEBUG("Setting migration downtime to %llums", downtime);

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_DOWNTIME)) {
-        if (!(migParams = qemuMigrationParamsNew()))
-            goto endjob;
+    if (!(migParams = qemuMigrationParamsNew()))
+        goto endjob;

-        if (qemuMigrationParamsSetULL(migParams,
-                                      QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT,
-                                      downtime) < 0)
-            goto endjob;
+    if (qemuMigrationParamsSetULL(migParams,
+                                  QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT,
+                                  downtime) < 0)
+        goto endjob;

-        if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
-                                     migParams, 0) < 0)
-            goto endjob;
-    } else {
-        qemuDomainObjEnterMonitor(driver, vm);
-        rc = qemuMonitorSetMigrationDowntime(priv->mon, downtime);
-        qemuDomainObjExitMonitor(vm);
-        if (rc < 0)
-            goto endjob;
-    }
+    if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
+                                 migParams, 0) < 0)
+        goto endjob;

     ret = 0;

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:39 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:39 +0200
Subject: [PATCH 4/7] qemu: capabilties: Retire
 QEMU_CAPS_MIGRATION_PARAM_DOWNTIME
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <3ae584198bbf21cc089b1c3520d579d03c5d4aed.1657888221.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 37 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2bce58e5c4..d8a15137dd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -588,7 +588,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "query-cpu-model-expansion.migratable", /* X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE */
               "fw_cfg", /* X_QEMU_CAPS_FW_CFG */
               "migration-param.bandwidth", /* X_QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH */
-              "migration-param.downtime", /* QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */
+              "migration-param.downtime", /* X_QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */

               /* 375 */
               "migration-param.xbzrle-cache-size", /* QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE */
@@ -1604,7 +1604,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARDEV_FILE_APPEND },
     { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
     { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
-    { "migrate-set-parameters/arg-type/downtime-limit", QEMU_CAPS_MIGRATION_PARAM_DOWNTIME },
     { "migrate-set-parameters/arg-type/xbzrle-cache-size", QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE },
     { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
     { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 720bc6ced8..b44ce703f3 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -567,7 +567,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION_MIGRATABLE, /* query-cpu-model-expansion supports migratable:false */
     X_QEMU_CAPS_FW_CFG, /* -fw_cfg command line option */
     X_QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
-    QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */
+    X_QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */

     /* 375 */
     QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index 1b5263622f..c63312ac06 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -126,7 +126,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index dd19d09052..a5cdc5958f 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -169,7 +169,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index 718823a121..c6951820a9 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -135,7 +135,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 7f92dbdbe8..1ff3e0b3b8 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -140,7 +140,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index 0594b5744f..f32f9ce0bb 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -133,7 +133,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 882b7801e3..34cc2905e8 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -133,7 +133,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 7feb9a520f..996c6921ff 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -104,7 +104,6 @@
   <flag name='query-cpu-model-comparison'/>
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 3b33ec749c..356f63ef40 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -174,7 +174,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index b465e1f239..f7e80f305f 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -180,7 +180,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 0694375df6..3f5bb5f56e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -147,7 +147,6 @@
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 017203a293..885d5c6ddc 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -145,7 +145,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 613a581a3c..d090850570 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -114,7 +114,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index d7da79c79f..815815c13e 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -188,7 +188,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 8dc04ff823..c05fde4a31 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 12425b005e..7ed7c73815 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -161,7 +161,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 40ef19ef00..de94d9560f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -149,7 +149,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 10c2e4af8e..b8c2f0eef4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -194,7 +194,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 771cb541fb..9f79447348 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -72,7 +72,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 302daeede8..a2a6109914 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 0163b78fe6..36df7da96b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 1c0dd5281a..6a083c8e89 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -159,7 +159,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 9cda765cf7..3c8739fac5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -147,7 +147,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index edf8bed66d..776d10fc24 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -117,7 +117,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index e6e0f42f19..43a6532c23 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 1def558aad..5e5e4cf5b9 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 40c7e1fa91..51a1c58ac8 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -116,7 +116,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index dd51d9eae0..cb2bd41e14 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 1f88a3a8b5..6224ba5256 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 9d283e2b29..73312f4aaf 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -165,7 +165,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index b7eabcf2f3..27d07be474 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -158,7 +158,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 1658bc8cb1..acb3e696fc 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 869c3074ad..f68422e00a 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -166,7 +166,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index d0a132ee2f..794e60c56a 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -168,7 +168,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7254d0dc70..dd5c4078d6 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index d13ed637b6..9ff8cc6c23 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.downtime'/>
   <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:40 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:40 +0200
Subject: [PATCH 5/7] qemu: Always assume support for
 QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <dea174909b4ec11fbf9ae6a578a148b3dc608b24.1657888221.git.pkrempa@redhat.com>

The 'xbzrle-cache-size' parameter was added in qemu-2.11 thus all
supported qemu versions now use the new code path.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c           | 56 +++++++++-----------------------
 src/qemu/qemu_migration_params.c | 18 ----------
 2 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0a5239e136..75c7a8a6b2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13161,10 +13161,8 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
 {
     virQEMUDriver *driver = dom->conn->privateData;
     virDomainObj *vm;
-    qemuDomainObjPrivate *priv;
     g_autoptr(qemuMigrationParams) migParams = NULL;
     int ret = -1;
-    int rc;

     virCheckFlags(0, -1);

@@ -13180,8 +13178,6 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    priv = vm->privateData;
-
     if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("Compressed migration is not supported by "
@@ -13189,22 +13185,14 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
         goto endjob;
     }

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
-        if (qemuMigrationParamsFetch(driver, vm, VIR_ASYNC_JOB_NONE,
-                                     &migParams) < 0)
-            goto endjob;
+    if (qemuMigrationParamsFetch(driver, vm, VIR_ASYNC_JOB_NONE,
+                                 &migParams) < 0)
+        goto endjob;

-        if (qemuMigrationParamsGetULL(migParams,
-                                      QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
-                                      cacheSize) < 0)
-            goto endjob;
-    } else {
-        qemuDomainObjEnterMonitor(driver, vm);
-        rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
-        qemuDomainObjExitMonitor(vm);
-        if (rc < 0)
-            goto endjob;
-    }
+    if (qemuMigrationParamsGetULL(migParams,
+                                  QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
+                                  cacheSize) < 0)
+        goto endjob;

     ret = 0;

@@ -13223,10 +13211,8 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
 {
     virQEMUDriver *driver = dom->conn->privateData;
     virDomainObj *vm;
-    qemuDomainObjPrivate *priv;
     g_autoptr(qemuMigrationParams) migParams = NULL;
     int ret = -1;
-    int rc;

     virCheckFlags(0, -1);

@@ -13242,8 +13228,6 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    priv = vm->privateData;
-
     if (!qemuMigrationCapsGet(vm, QEMU_MIGRATION_CAP_XBZRLE)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("Compressed migration is not supported by "
@@ -13252,25 +13236,17 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
     }

     VIR_DEBUG("Setting compression cache to %llu B", cacheSize);
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
-        if (!(migParams = qemuMigrationParamsNew()))
-            goto endjob;
+    if (!(migParams = qemuMigrationParamsNew()))
+        goto endjob;

-        if (qemuMigrationParamsSetULL(migParams,
-                                      QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
-                                      cacheSize) < 0)
-            goto endjob;
+    if (qemuMigrationParamsSetULL(migParams,
+                                  QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
+                                  cacheSize) < 0)
+        goto endjob;

-        if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
-                                     migParams, 0) < 0)
-            goto endjob;
-    } else {
-        qemuDomainObjEnterMonitor(driver, vm);
-        rc = qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize);
-        qemuDomainObjExitMonitor(vm);
-        if (rc < 0)
-            goto endjob;
-    }
+    if (qemuMigrationParamsApply(driver, vm, VIR_ASYNC_JOB_NONE,
+                                 migParams, 0) < 0)
+        goto endjob;

     ret = 0;

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 6ea0bde13a..0bce358ac3 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -886,10 +886,8 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
                          unsigned long apiFlags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool xbzrleCacheSize_old = false;
     g_autoptr(virJSONValue) params = NULL;
     g_autoptr(virJSONValue) caps = NULL;
-    qemuMigrationParam xbzrle = QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE;
     bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME);
     int ret = -1;

@@ -917,19 +915,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
         }
     }

-    /* If QEMU is too old to support xbzrle-cache-size migration parameter,
-     * we need to set it via migrate-set-cache-size and tell
-     * qemuMonitorSetMigrationParams to ignore this parameter.
-     */
-    if (migParams->params[xbzrle].set &&
-        !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
-        if (qemuMonitorSetMigrationCacheSize(priv->mon,
-                                             migParams->params[xbzrle].value.ull) < 0)
-            goto cleanup;
-        xbzrleCacheSize_old = true;
-        migParams->params[xbzrle].set = false;
-    }
-
     if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume)))
         goto cleanup;

@@ -942,9 +927,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
  cleanup:
     qemuDomainObjExitMonitor(vm);

-    if (xbzrleCacheSize_old)
-        migParams->params[xbzrle].set = true;
-
     return ret;
 }

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:41 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:41 +0200
Subject: [PATCH 6/7] qemu: capabilities: Retire
 QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <343183ff7327e3ecc971acd8d48f90e69122e2cf.1657888221.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 37 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d8a15137dd..cf8f33475c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -591,7 +591,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "migration-param.downtime", /* X_QEMU_CAPS_MIGRATION_PARAM_DOWNTIME */

               /* 375 */
-              "migration-param.xbzrle-cache-size", /* QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE */
+              "migration-param.xbzrle-cache-size", /* X_QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE */
               "intel-iommu.aw-bits", /* QEMU_CAPS_INTEL_IOMMU_AW_BITS */
               "spapr-tpm-proxy", /* QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY */
               "numa.hmat", /* QEMU_CAPS_NUMA_HMAT */
@@ -1604,7 +1604,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARDEV_FILE_APPEND },
     { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
     { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
-    { "migrate-set-parameters/arg-type/xbzrle-cache-size", QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE },
     { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
     { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
     { "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b44ce703f3..67769fcfe4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -570,7 +570,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */

     /* 375 */
-    QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
+    X_QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
     QEMU_CAPS_INTEL_IOMMU_AW_BITS, /* intel-iommu.aw-bits */
     QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY, /* -device spapr-tpm-proxy */
     QEMU_CAPS_NUMA_HMAT, /* -numa hmat */
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
index c63312ac06..6d4cc74a4d 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@@ -126,7 +126,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
index a5cdc5958f..b5cee8476c 100644
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@@ -169,7 +169,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
index c6951820a9..88a1a7d0be 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@@ -135,7 +135,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
index 1ff3e0b3b8..457a223c3f 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@@ -140,7 +140,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
index f32f9ce0bb..bc04b28218 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@@ -133,7 +133,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
index 34cc2905e8..d0b6617a85 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@@ -133,7 +133,6 @@
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
index 996c6921ff..7fc803030d 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@@ -104,7 +104,6 @@
   <flag name='query-cpu-model-comparison'/>
   <flag name='drive-nvme'/>
   <flag name='tcg'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
index 356f63ef40..4de052d3cb 100644
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@@ -174,7 +174,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index f7e80f305f..c3ff50a4f9 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -180,7 +180,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 3f5bb5f56e..36b649ab91 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -147,7 +147,6 @@
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 885d5c6ddc..d302ab3813 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -145,7 +145,6 @@
   <flag name='machine.pseries.cap-ibs'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index d090850570..134eddcb6c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -114,7 +114,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 815815c13e..36e12d511a 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -188,7 +188,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c05fde4a31..615c8e8813 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 7ed7c73815..3db9743c36 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -161,7 +161,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index de94d9560f..81c6b5807f 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -149,7 +149,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index b8c2f0eef4..e0e67aebec 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -194,7 +194,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 9f79447348..1db1b1b16c 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -72,7 +72,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a2a6109914..ab2a92bab2 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 36df7da96b..088266fcd0 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 6a083c8e89..9ba3ef5717 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -159,7 +159,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 3c8739fac5..ee5469db9d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -147,7 +147,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 776d10fc24..5e38a0b571 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -117,7 +117,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='virtio-balloon.free-page-reporting'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 43a6532c23..b79de664bd 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 5e5e4cf5b9..01e30f4e02 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 51a1c58ac8..aa7b5deab5 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -116,7 +116,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='virtio-balloon.free-page-reporting'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index cb2bd41e14..d9e385ab1d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 6224ba5256..05f297dfa2 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 73312f4aaf..9cb1a32354 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -165,7 +165,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 27d07be474..5df148d787 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -158,7 +158,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index acb3e696fc..dd011f8408 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index f68422e00a..39a5cd154d 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -166,7 +166,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 794e60c56a..6e872f4f85 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -168,7 +168,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index dd5c4078d6..a8f46df1cd 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 9ff8cc6c23..8464909698 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -193,7 +193,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
-  <flag name='migration-param.xbzrle-cache-size'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
   <flag name='blockdev-hostdev-scsi'/>
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 15 12:31:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 15 Jul 2022 14:31:42 +0200
Subject: [PATCH 7/7] qemu: monitor: Remove unused migration property
 getters/setters
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <6d276a1f2016fe3341a4e9c5b0b0faa84bcccdc8.1657888221.git.pkrempa@redhat.com>

The getters/setters for individual properties of migration
speed/downtime/cache size are unused once we switched to setting them
purely via migration parameters. Remove the unused helpers.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 55 ---------------------
 src/qemu/qemu_monitor.h      | 11 -----
 src/qemu/qemu_monitor_json.c | 96 ------------------------------------
 src/qemu/qemu_monitor_json.h | 15 ------
 tests/qemumonitorjsontest.c  | 39 ---------------
 5 files changed, 216 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index fda5d2f368..109107eaae 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2245,61 +2245,6 @@ qemuMonitorSetDBusVMStateIdList(qemuMonitor *mon,
 }


-int
-qemuMonitorSetMigrationSpeed(qemuMonitor *mon,
-                             unsigned long bandwidth)
-{
-    VIR_DEBUG("bandwidth=%lu", bandwidth);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    if (bandwidth > QEMU_DOMAIN_MIG_BANDWIDTH_MAX) {
-        virReportError(VIR_ERR_OVERFLOW,
-                       _("bandwidth must be less than %llu"),
-                       QEMU_DOMAIN_MIG_BANDWIDTH_MAX + 1ULL);
-        return -1;
-    }
-
-    return qemuMonitorJSONSetMigrationSpeed(mon, bandwidth);
-}
-
-
-int
-qemuMonitorSetMigrationDowntime(qemuMonitor *mon,
-                                unsigned long long downtime)
-{
-    VIR_DEBUG("downtime=%llu", downtime);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONSetMigrationDowntime(mon, downtime);
-}
-
-
-int
-qemuMonitorGetMigrationCacheSize(qemuMonitor *mon,
-                                 unsigned long long *cacheSize)
-{
-    VIR_DEBUG("cacheSize=%p", cacheSize);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONGetMigrationCacheSize(mon, cacheSize);
-}
-
-
-int
-qemuMonitorSetMigrationCacheSize(qemuMonitor *mon,
-                                 unsigned long long cacheSize)
-{
-    VIR_DEBUG("cacheSize=%llu", cacheSize);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONSetMigrationCacheSize(mon, cacheSize);
-}
-
-
 /**
  * qemuMonitorGetMigrationParams:
  * @mon: Pointer to the monitor object.
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 95267ec6c7..f7e01f71fe 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -770,17 +770,6 @@ int qemuMonitorSavePhysicalMemory(qemuMonitor *mon,
 int qemuMonitorSetDBusVMStateIdList(qemuMonitor *mon,
                                     GSList *list);

-int qemuMonitorSetMigrationSpeed(qemuMonitor *mon,
-                                 unsigned long bandwidth);
-
-int qemuMonitorSetMigrationDowntime(qemuMonitor *mon,
-                                    unsigned long long downtime);
-
-int qemuMonitorGetMigrationCacheSize(qemuMonitor *mon,
-                                     unsigned long long *cacheSize);
-int qemuMonitorSetMigrationCacheSize(qemuMonitor *mon,
-                                     unsigned long long cacheSize);
-
 int qemuMonitorGetMigrationParams(qemuMonitor *mon,
                                   virJSONValue **params);
 int qemuMonitorSetMigrationParams(qemuMonitor *mon,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 80696de731..5e4a86e5ad 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3034,102 +3034,6 @@ qemuMonitorJSONSavePhysicalMemory(qemuMonitor *mon,
 }


-int qemuMonitorJSONSetMigrationSpeed(qemuMonitor *mon,
-                                     unsigned long bandwidth)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("migrate_set_speed",
-                                     "U:value", bandwidth * 1024ULL * 1024ULL,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-int qemuMonitorJSONSetMigrationDowntime(qemuMonitor *mon,
-                                        unsigned long long downtime)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("migrate_set_downtime",
-                                     "d:value", downtime / 1000.0,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-int
-qemuMonitorJSONGetMigrationCacheSize(qemuMonitor *mon,
-                                     unsigned long long *cacheSize)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    *cacheSize = 0;
-
-    cmd = qemuMonitorJSONMakeCommand("query-migrate-cache-size", NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_NUMBER) < 0)
-        return -1;
-
-    if (virJSONValueObjectGetNumberUlong(reply, "return", cacheSize) < 0) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("invalid cache size in query-migrate-cache-size reply"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
-int
-qemuMonitorJSONSetMigrationCacheSize(qemuMonitor *mon,
-                                     unsigned long long cacheSize)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("migrate-set-cache-size",
-                                     "U:value", cacheSize,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 int
 qemuMonitorJSONGetMigrationParams(qemuMonitor *mon,
                                   virJSONValue **params)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index ad3853ae69..7006aa8c46 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -152,21 +152,6 @@ qemuMonitorJSONSavePhysicalMemory(qemuMonitor *mon,
                                   unsigned long long length,
                                   const char *path);

-int
-qemuMonitorJSONSetMigrationSpeed(qemuMonitor *mon,
-                                 unsigned long bandwidth);
-
-int
-qemuMonitorJSONSetMigrationDowntime(qemuMonitor *mon,
-                                    unsigned long long downtime);
-
-int
-qemuMonitorJSONGetMigrationCacheSize(qemuMonitor *mon,
-                                     unsigned long long *cacheSize);
-int
-qemuMonitorJSONSetMigrationCacheSize(qemuMonitor *mon,
-                                     unsigned long long cacheSize);
-
 int
 qemuMonitorJSONGetMigrationParams(qemuMonitor *mon,
                                   virJSONValue **params);
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index ca1b8c3000..692aa75791 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1203,8 +1203,6 @@ GEN_TEST_FUNC(qemuMonitorJSONEjectMedia, "hdc", true)
 GEN_TEST_FUNC(qemuMonitorJSONChangeMedia, "hdc", "/foo/bar", "formatstr")
 GEN_TEST_FUNC(qemuMonitorJSONSaveVirtualMemory, 0, 1024, "/foo/bar")
 GEN_TEST_FUNC(qemuMonitorJSONSavePhysicalMemory, 0, 1024, "/foo/bar")
-GEN_TEST_FUNC(qemuMonitorJSONSetMigrationSpeed, 1024)
-GEN_TEST_FUNC(qemuMonitorJSONSetMigrationDowntime, 1)
 GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND |
               QEMU_MONITOR_MIGRATE_NON_SHARED_DISK |
               QEMU_MONITOR_MIGRATE_NON_SHARED_INC, "tcp:localhost:12345")
@@ -1714,40 +1712,6 @@ testQemuMonitorJSONqemuMonitorJSONGetAllBlockStatsInfo(const void *opaque)
 }


-static int
-testQemuMonitorJSONqemuMonitorJSONGetMigrationCacheSize(const void *opaque)
-{
-    const testGenericData *data = opaque;
-    virDomainXMLOption *xmlopt = data->xmlopt;
-    unsigned long long cacheSize;
-    g_autoptr(qemuMonitorTest) test = NULL;
-
-    if (!(test = qemuMonitorTestNewSchema(xmlopt, data->schema)))
-        return -1;
-
-    qemuMonitorTestSkipDeprecatedValidation(test, true);
-
-    if (qemuMonitorTestAddItem(test, "query-migrate-cache-size",
-                               "{"
-                               "    \"return\": 67108864,"
-                               "    \"id\": \"libvirt-12\""
-                               "}") < 0)
-        return -1;
-
-    if (qemuMonitorJSONGetMigrationCacheSize(qemuMonitorTestGetMonitor(test),
-                                             &cacheSize) < 0)
-        return -1;
-
-    if (cacheSize != 67108864) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       "Invalid cacheSize: %llu, expected 67108864",
-                       cacheSize);
-        return -1;
-    }
-
-    return 0;
-}
-
 static int
 testQemuMonitorJSONqemuMonitorJSONGetMigrationStats(const void *opaque)
 {
@@ -3105,8 +3069,6 @@ mymain(void)
     DO_TEST_GEN_DEPRECATED(qemuMonitorJSONChangeMedia, true);
     DO_TEST_GEN(qemuMonitorJSONSaveVirtualMemory);
     DO_TEST_GEN(qemuMonitorJSONSavePhysicalMemory);
-    DO_TEST_GEN_DEPRECATED(qemuMonitorJSONSetMigrationSpeed, true);
-    DO_TEST_GEN_DEPRECATED(qemuMonitorJSONSetMigrationDowntime, true);
     DO_TEST_GEN(qemuMonitorJSONMigrate);
     DO_TEST_GEN(qemuMonitorJSONMigrateRecover);
     DO_TEST_SIMPLE("migrate-pause", qemuMonitorJSONMigratePause);
@@ -3136,7 +3098,6 @@ mymain(void)
     DO_TEST(qemuMonitorJSONGetBalloonInfo);
     DO_TEST(qemuMonitorJSONGetBlockInfo);
     DO_TEST(qemuMonitorJSONGetAllBlockStatsInfo);
-    DO_TEST(qemuMonitorJSONGetMigrationCacheSize);
     DO_TEST(qemuMonitorJSONGetMigrationStats);
     DO_TEST(qemuMonitorJSONGetChardevInfo);
     DO_TEST(qemuMonitorJSONSetBlockIoThrottle);
-- 
2.36.1


From mprivozn at redhat.com  Fri Jul 15 13:38:59 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 15 Jul 2022 15:38:59 +0200
Subject: [PATCH 0/7] qemu: Remove unused code for tuning migration
 parameters
In-Reply-To: <cover.1657888221.git.pkrempa@redhat.com>
References: <cover.1657888221.git.pkrempa@redhat.com>
Message-ID: <7841f2a9-80db-9a68-dbcb-27a401c649e3@redhat.com>

On 7/15/22 14:31, Peter Krempa wrote:
> All qemu versions supported by libvirt allow setting everything via
> migration parameters which is also the preferred code path in libvirt.
> 
> Remove the legacy code.
> 
> Peter Krempa (7):
>   qemu: Always assume support for QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
>   qemu: capabilities: Retire QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH
>   qemu: driver: Always assume support for
>     QEMU_CAPS_MIGRATION_PARAM_DOWNTIME
>   qemu: capabilties: Retire QEMU_CAPS_MIGRATION_PARAM_DOWNTIME
>   qemu: Always assume support for
>     QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE
>   qemu: capabilities: Retire QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE
>   qemu: monitor: Remove unused migration property getters/setters
> 
>  src/qemu/qemu_capabilities.c                  |   9 +-
>  src/qemu/qemu_capabilities.h                  |   6 +-
>  src/qemu/qemu_driver.c                        | 125 ++++++------------
>  src/qemu/qemu_migration.c                     |  53 +++-----
>  src/qemu/qemu_migration_params.c              |  18 ---
>  src/qemu/qemu_monitor.c                       |  55 --------
>  src/qemu/qemu_monitor.h                       |  11 --
>  src/qemu/qemu_monitor_json.c                  |  96 --------------
>  src/qemu/qemu_monitor_json.h                  |  15 ---
>  .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml |   3 -
>  .../caps_3.1.0.x86_64.xml                     |   3 -
>  .../caps_4.0.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml |   3 -
>  .../caps_4.0.0.riscv32.xml                    |   3 -
>  .../caps_4.0.0.riscv64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |   3 -
>  .../caps_4.0.0.x86_64.xml                     |   3 -
>  .../caps_4.1.0.x86_64.xml                     |   3 -
>  .../caps_4.2.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |   3 -
>  .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |   3 -
>  .../caps_4.2.0.x86_64.xml                     |   3 -
>  .../caps_5.0.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |   3 -
>  .../caps_5.0.0.riscv64.xml                    |   3 -
>  .../caps_5.0.0.x86_64.xml                     |   3 -
>  .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |   3 -
>  .../caps_5.1.0.x86_64.xml                     |   3 -
>  .../caps_5.2.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |   3 -
>  .../caps_5.2.0.riscv64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |   3 -
>  .../caps_5.2.0.x86_64.xml                     |   3 -
>  .../caps_6.0.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |   3 -
>  .../caps_6.0.0.x86_64.xml                     |   3 -
>  .../caps_6.1.0.x86_64.xml                     |   3 -
>  .../caps_6.2.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |   3 -
>  .../caps_6.2.0.x86_64.xml                     |   3 -
>  .../caps_7.0.0.aarch64.xml                    |   3 -
>  .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |   3 -
>  .../caps_7.0.0.x86_64.xml                     |   3 -
>  .../caps_7.1.0.x86_64.xml                     |   3 -
>  tests/qemumonitorjsontest.c                   |  39 ------
>  45 files changed, 59 insertions(+), 473 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Fri Jul 15 13:57:15 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 15 Jul 2022 15:57:15 +0200
Subject: [PATCH for 8.7.0 00/20] Bump minimum supported qemu version to
 qemu-4.2 (part 1)
In-Reply-To: <cover.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
Message-ID: <d24c147c-2b1b-e258-604e-b43d66f3dcf8@redhat.com>

On 7/15/22 13:44, Peter Krempa wrote:
> In August Debian 10 officially reaches EOL, thus we can bump minimum
> qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
> 
> QEMU-4.2 allows us to remove a big bunch of old code though. Few
> examples which this series (and the next iterations of it)  will deal
> with:
>  - old auidiodev config via ENV variables
>  - old-style VIRTIO tranitional setup (possibly)
>  - most of legacy block device setup (upcoming series)
> 
> This series is lacking the removal of Debian 10 from our CI infra
> though, I'll post that separately once I get to it.
> 
> The patches can also be fetched at:
> 
>  git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
> 
> as some of the pure-removal patches here will be truncated to prevent
> spamming the list.
> 
> Peter Krempa (20):
>   qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
>     'x86-kvm-32-on-64'
>   tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
>     tests
>   qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
>   qemuxml2argvtest: Remove 'qemu-3.1' versions of
>     virtio-(non-)transitional tests
>   qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
>     test
>   qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
>     case
>   qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
>     and 'cpu-tsc-frequency'
>   tests: qemucapabilities: Remove qemu-3.1 test data
>   tests: domaincaps: Remove test data for qemu-3.1
>   qemucapabilitiestest: Remove test data for qemu-4.0
>   domaincapstest: Remove test data for qemu-4.0
>   qemucapabilitiestest: Remove test data for qemu-4.1
>   domaincapstest: Remove test data for qemu-4.1
>   qemu: Formally deprecate support for qemu < 4.2
>   qemu: command: Always assume QEMU_CAPS_AUDIODEV
>   qemu: command: Drop the code for configuring audio devices via
>     environment variables
>   qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
>   qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
>   qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
>     tests
>   qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
> 

>  590 files changed, 495 insertions(+), 218552 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Fri Jul 15 13:57:20 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 15 Jul 2022 15:57:20 +0200
Subject: [PATCH 18/20] qemu: validate: Remove unreachable checks for
 QEMU_CAPS_AUDIODEV
In-Reply-To: <ecaccd1d40efb961d02b50a4faf16c8dbdbc1b64.1657884290.git.pkrempa@redhat.com>
References: <cover.1657884290.git.pkrempa@redhat.com>
 <ecaccd1d40efb961d02b50a4faf16c8dbdbc1b64.1657884290.git.pkrempa@redhat.com>
Message-ID: <d6af28a6-008d-0c39-7aeb-d3c0e66719fc@redhat.com>

On 7/15/22 13:44, Peter Krempa wrote:
> We now only support qemu versions which already have the capability so
> we can remove this now unused code.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  src/qemu/qemu_validate.c | 86 ----------------------------------------
>  1 file changed, 86 deletions(-)
> 
> diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> index 764d5b029e..4016b1b6f0 100644
> --- a/src/qemu/qemu_validate.c
> +++ b/src/qemu/qemu_validate.c
> @@ -1344,13 +1344,6 @@ qemuValidateDomainDef(const virDomainDef *def,
>          }
>      }
> 
> -    if (def->naudios > 1 &&
> -        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
> -        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                       _("only one audio backend is supported with this QEMU binary"));
> -        return -1;
> -    }
> -
>      return 0;
>  }
> 
> @@ -4530,25 +4523,6 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
>                                   const virDomainDef *def,
>                                   virQEMUCaps *qemuCaps G_GNUC_UNUSED)
>  {
> -    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
> -        if (audio->input.mixingEngine == VIR_TRISTATE_BOOL_NO ||
> -            audio->output.mixingEngine == VIR_TRISTATE_BOOL_NO) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                           _("disabling audio mixing engine is not supported with this QEMU"));
> -            return -1;
> -        }
> -
> -        if ((audio->input.bufferLength ||
> -             audio->output.bufferLength) &&
> -            (audio->type != VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO &&
> -             audio->type != VIR_DOMAIN_AUDIO_TYPE_COREAUDIO &&
> -             audio->type != VIR_DOMAIN_AUDIO_TYPE_SDL)) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                           _("setting audio buffer length is not supported with this QEMU"));
> -            return -1;
> -        }
> -    }
> -
>      switch (audio->type) {
>      case VIR_DOMAIN_AUDIO_TYPE_NONE:
>          break;
> @@ -4557,78 +4531,18 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
>          break;
> 
>      case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
> -        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
> -            if (audio->input.bufferLength) {
> -                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                               _("setting audio buffer length is not supported with this QEMU"));
> -                return -1;
> -            }
> -            if (audio->backend.coreaudio.input.bufferCount) {
> -                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                               _("setting audio buffer count is not supported with this QEMU"));
> -                return -1;
> -            }
> -        }
>          break;
> 
>      case VIR_DOMAIN_AUDIO_TYPE_JACK:
> -        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                           _("'jack' audio backend is not supported with this QEMU"));
> -            return -1;
> -        }
>          break;

These 'break' statements, well 'case' can be joined into a single one:

case X:
case Y:
case Z:
    break;

Michal


From jdenemar at redhat.com  Mon Jul 18 08:25:25 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Mon, 18 Jul 2022 10:25:25 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <20220715091458.2620872-1-eperezma@redhat.com>
References: <20220715091458.2620872-1-eperezma@redhat.com>
Message-ID: <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>

On Fri, Jul 15, 2022 at 11:14:58 +0200, Eugenio P?rez wrote:
> Currently, the migration code denies migration as long as the VM has a
> vhost-vDPA device.
> 
> While it's true that vhost-vDPA devices cannot be migrated at the moment, there are plans to be able to migrate them soon.
> 
> Libvirt must treat it equal to vhost-kernel devices: Not all of them can
> be migrated (the ones that do not expose the feature VHOST_F_LOG_ALL
> cannot be migrated). So checks like this one should work for all vhost
> devices equally.
> 
> A more accurate solution is to ask qemu if it has an active migration
> blocker at that moment. Hoever, that require synchronization to avoid
> qemu to add one between the query and the actual migration command.

What would cause QEMU to add such a blocker? I believe it wouldn't do it
by itself and I hope even guest action would not cause migration blocker
to be added. Which in ideal case would mean only a QMP command (such as
hotplugging a non-migratable device) is the only way to add migration
blocker. If this is true, than we're safe as libvirt does not allow such
commands between qemuMigrationSrcIsAllowed and migration start.

That said, is there a reason for not implementing the correct solution
right away as a separate patch?

Jirka

From eperezma at redhat.com  Mon Jul 18 08:40:56 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Mon, 18 Jul 2022 10:40:56 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>

On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Fri, Jul 15, 2022 at 11:14:58 +0200, Eugenio P?rez wrote:
> > Currently, the migration code denies migration as long as the VM has a
> > vhost-vDPA device.
> >
> > While it's true that vhost-vDPA devices cannot be migrated at the moment, there are plans to be able to migrate them soon.
> >
> > Libvirt must treat it equal to vhost-kernel devices: Not all of them can
> > be migrated (the ones that do not expose the feature VHOST_F_LOG_ALL
> > cannot be migrated). So checks like this one should work for all vhost
> > devices equally.
> >
> > A more accurate solution is to ask qemu if it has an active migration
> > blocker at that moment. Hoever, that require synchronization to avoid
> > qemu to add one between the query and the actual migration command.
>
> What would cause QEMU to add such a blocker? I believe it wouldn't do it
> by itself and I hope even guest action would not cause migration blocker
> to be added.

Qemu already adds a blocker in those cases. For example, in
hw/virtio/vhost.c:vhost_dev_init, you can find this conditional:
--
    if (hdev->migration_blocker == NULL) {
        if (!(hdev->features & (0x1ULL << VHOST_F_LOG_ALL))) {
            error_setg(&hdev->migration_blocker,
                       "Migration disabled: vhost lacks
VHOST_F_LOG_ALL feature.");
        } else if (vhost_dev_log_is_shared(hdev) && !qemu_memfd_alloc_check()) {
            error_setg(&hdev->migration_blocker,
                       "Migration disabled: failed to allocate shared memory");
        }
    }

    if (hdev->migration_blocker != NULL) {
        r = migrate_add_blocker(hdev->migration_blocker, errp);
        ...
    }
--

So "migrate" command fails at monitor with that error message

> Which in ideal case would mean only a QMP command (such as
> hotplugging a non-migratable device) is the only way to add migration
> blocker. If this is true, than we're safe as libvirt does not allow such
> commands between qemuMigrationSrcIsAllowed and migration start.
>

Ok, that rules out a few bad use cases. I can do a fast lookup to
check if blockers can be added without the knowledge of libvirt.

> That said, is there a reason for not implementing the correct solution
> right away as a separate patch?
>

I was not sure if libvirt already had another way to check, for
example, if the vhost device didn't have VHOST_F_LOG_ALL feature. If
not, I think checking for blockers it's the right thing to do.

Thanks!


From twiederh at redhat.com  Mon Jul 18 09:12:45 2022
From: twiederh at redhat.com (Tim Wiederhake)
Date: Mon, 18 Jul 2022 11:12:45 +0200
Subject: [merged][libvirt PATCH] docs: Fix typos
Message-ID: <20220718091245.19225-1-twiederh@redhat.com>

Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
---
 docs/drvqemu.rst | 2 +-
 docs/testing.rst | 2 +-
 docs/testtck.rst | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst
index c9f2432268..c33706ccea 100644
--- a/docs/drvqemu.rst
+++ b/docs/drvqemu.rst
@@ -449,7 +449,7 @@ for libvirt to check compatibility prior to migration.
 If using ``host-model`` the target host hardware and software deployment
 must expose a superset of the features of the source host CPU. If using
 ``host-passthrough`` the target host CPU and software deployment must
-always expose a superset of the fetures, however, it is further strongly
+always expose a superset of the features, however, it is further strongly
 recommended that the source and destination hosts be identical in every
 way.
 
diff --git a/docs/testing.rst b/docs/testing.rst
index 21abf42080..a597c3ed07 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -30,7 +30,7 @@ valuable marker when accepting upstream contributions. Therefore, it is
 recommended to run libvirt builds against your changes in various containers to
 either locally or by using GitLab's shared CI runners to make sure everything
 runs cleanly before submitting your patches. The images themselves come from
-libvirt's GitLab container registry, but this can be overriden if needed, see
+libvirt's GitLab container registry, but this can be overridden if needed, see
 below.
 
 Registry
diff --git a/docs/testtck.rst b/docs/testtck.rst
index 6264b40de7..100a278acd 100644
--- a/docs/testtck.rst
+++ b/docs/testtck.rst
@@ -33,7 +33,7 @@ happens.
 Using TCK
 ---------
 
-TCK can be used independently of the enviroment, i.e. both on your local host
+TCK can be used independently of the environment, i.e. both on your local host
 or in a VM. We strongly recommend using a VM for the tests as TCK might affect
 your current host setup, see `Running TCK`_.
 
-- 
2.36.1


From twiederh at redhat.com  Mon Jul 18 09:29:29 2022
From: twiederh at redhat.com (Tim Wiederhake)
Date: Mon, 18 Jul 2022 11:29:29 +0200
Subject: [libvirt PATCH 0/9] [RFC] Dynamic CPU models
In-Reply-To: <20220628160946.61028-1-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
Message-ID: <ee2d6ffa30005707bee9b85ab6d8d749320c4b34.camel@redhat.com>

See below.
What do the more experienced libvirt developers think, is this going in
the right direction?

Thanks,
Tim

On Tue, 2022-06-28 at 18:09 +0200, Tim Wiederhake wrote:
> libvirt and qemu cpu models are out of sync. libvirt cpu models are
> considered static and never changing, whereas qemu cpu models have
> changed over time. This leads to problems and confusion for users,
> as the cpu models they specify may have different features than what
> they expect.
> 
> This series introduces two new APIs to enumerate and retrieve cpu
> models dynamically from the hypervisor at runtime, allowing the user
> to make use of cpu models from newer hypervisor versions even if
> libvirt is not aware of them.
> 
> These two new functions are intended as building blocks onto which
> higher-level functionality can be build, e.g. the ability to specify
> a hypervisor cpu model directly in a domain xml. With these two
> functions alone this has to be done manually for now, i.e. enumerate
> the available cpu models, retrieve the cpu description and manually
> insert it into the domain xml accordingly:
> 
> ??? $ virsh hypervisor-cpu-models --arch x86_64
> ??? Name??????????????????????? Alias
> ??? ----------------------------------------------------
> ??? max
> ??? host
> ??? base
> ??? qemu64-v1
> ??? qemu64????????????????????? qemu64-v1
> ??? qemu32-v1
> ??? qemu32????????????????????? qemu32-v1
> ??? phenom-v1
> ??? phenom????????????????????? phenom-v1
> ??? (...)
> 
> ??? $ virsh hypervisor-cpu-definition --machine pc --arch x86_64
> qemu64
> ??? <cpu>
> ????? <model>qemu64</model>
> ????? <feature name='cmov'/>
> ????? <feature name='mmx'/>
> ????? <feature name='xd'/>
> ????? <feature name='x-intel-pt-auto-level'/>
> ????? <feature name='kvm_asyncpf'/>
> ????? <feature name='kvm-asyncpf'/>
> ????? <feature name='legacy-cache'/>
> ????? <feature name='vmware-cpuid-freq'/>
> ????? <feature name='mce'/>
> ????? <feature name='mca'/>
> ????? <feature name='msr'/>
> ????? <feature name='fxsr'/>
> ????? <feature name='cpuid-0xb'/>
> ????? <feature name='kvm_pv_eoi'/>
> ????? <feature name='pni'/>
> ????? <feature name='x2apic'/>
> ????? <feature name='i64'/>
> ????? <feature name='pae'/>
> ????? <feature name='pat'/>
> ????? <feature name='sse'/>
> ????? <feature name='kvm_nopiodelay'/>
> ????? <feature name='kvm-nopiodelay'/>
> ????? <feature name='kvmclock-stable-bit'/>
> ????? <feature name='hypervisor'/>
> ????? <feature name='syscall'/>
> ????? <feature name='x-migrate-smi-count'/>
> ????? <feature name='full-cpuid-auto-level'/>
> ????? <feature name='sse3'/>
> ????? <feature name='sse2'/>
> ????? <feature name='kvm-pv-eoi'/>
> ????? <feature name='cx8'/>
> ????? <feature name='pge'/>
> ????? <feature name='fill-mtrr-mask'/>
> ????? <feature name='cx16'/>
> ????? <feature name='de'/>
> ????? <feature name='clflush'/>
> ????? <feature name='tsc'/>
> ????? <feature name='fpu'/>
> ????? <feature name='check'/>
> ????? <feature name='apic'/>
> ????? <feature name='kvm-steal-time'/>
> ????? <feature name='kvm_steal_time'/>
> ????? <feature name='kvmclock'/>
> ????? <feature name='l3-cache'/>
> ????? <feature name='nx'/>
> ????? <feature name='tcg-cpuid'/>
> ????? <feature name='lm'/>
> ????? <feature name='pse'/>
> ????? <feature name='sep'/>
> ????? <feature name='kvm'/>
> ????? <feature name='lahf-lm'/>
> ????? <feature name='lahf_lm'/>
> ????? <feature name='mtrr'/>
> ????? <feature name='pse36'/>
> ??? </cpu>
> 
> The returned cpu description is currently completely unfiltered, as
> can be seen by the duplicate entries differing only in "-" vs. "_"
> usage, inclusion of experimental feature flags and generally, flags
> that are not recognized by libvirt. One possibility to adress this
> would be to extend virQEMUCapsCPUFeatureTranslate.
> 
> Before I continue with this, I would love to hear other people's
> thoughts, comments and potential use cases.
> 
> Cheers,
> Tim
> 
> Tim Wiederhake (9):
> ? qemuMonitorCPUDefInfo: Add alias
> ? libvirt: introduce virConnectGetHypervisorCPUModelNames public API
> ? remote: Add RPC support for the
> virConnectGetHypervisorCPUModelNames
> ??? API
> ? qemu: implement virConnectGetHypervisorCPUModelNames API
> ? tools: Report hypervisor cpu model names
> ? libvirt: introduce virConnectGetHypervisorCPUModelDefinition public
> ??? API
> ? remote: Add support for the
> virConnectGetHypervisorCPUModelDefinition
> ??? API
> ? qemu: Implement virConnectGetHypervisorCPUModelDefinition API
> ? tools: Report hypervisor cpu model definitions
> 
> ?docs/manpages/virsh.rst???????????? |? 27 ++++++
> ?include/libvirt/libvirt-host.h????? |? 13 +++
> ?src/driver-hypervisor.h???????????? |? 17 ++++
> ?src/libvirt-host.c????????????????? | 109 +++++++++++++++++++++++
> ?src/libvirt_public.syms???????????? |?? 2 +
> ?src/qemu/qemu_driver.c????????????? | 105 ++++++++++++++++++++++
> ?src/qemu/qemu_monitor.c???????????? |?? 2 +
> ?src/qemu/qemu_monitor.h???????????? |?? 1 +
> ?src/qemu/qemu_monitor_json.c??????? |?? 3 +
> ?src/remote/remote_daemon_dispatch.c |? 76 ++++++++++++++++
> ?src/remote/remote_driver.c????????? | 100 +++++++++++++++++++++
> ?src/remote/remote_protocol.x??????? |? 37 +++++++-
> ?src/remote_protocol-structs???????? |? 27 ++++++
> ?tools/virsh-host.c????????????????? | 132
> ++++++++++++++++++++++++++++
> ?14 files changed, 650 insertions(+), 1 deletion(-)
> 
> -- 
> 2.31.1
> 
> 


From mprivozn at redhat.com  Mon Jul 18 09:30:42 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:42 +0200
Subject: [PATCH 0/8] conf: Don't lose <active_pcr_banks/> when no TPM version
 is provided
Message-ID: <cover.1658136603.git.mprivozn@redhat.com>

*** BLURB HERE ***

Michal Pr?vozn?k (8):
  conf: Report an error when default TPM model is provided
  conf: Report error when default TPM version is provided
  conf: Drop needless setting of VIR_DOMAIN_TPM_VERSION_DEFAULT
  conf: Move _virDomainTPMDef::version into
    _virDomainTPMDef::data::emulator
  conf: Use virXMLPropEnum more when parsing TPM
  qemu_domain: Move TPM post parse code into qemuDomainTPMDefPostParse()
  qemu: Move TPMs validation out of PostParse
  conf: Don't lose <active_pcr_banks/> when no TPM version is provided

 src/conf/domain_conf.c        | 81 +++++++++++++-------------------
 src/conf/domain_conf.h        | 10 ++--
 src/conf/domain_validate.c    | 28 ++++++++++-
 src/qemu/qemu_command.c       |  2 +-
 src/qemu/qemu_domain.c        | 63 ++++++-------------------
 src/qemu/qemu_tpm.c           | 10 ++--
 src/qemu/qemu_validate.c      | 87 ++++++++++++++++++++++++-----------
 src/security/virt-aa-helper.c |  2 +-
 8 files changed, 147 insertions(+), 136 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:44 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:44 +0200
Subject: [PATCH 2/8] conf: Report error when default TPM version is provided
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <838c8127f28cdf75364d8e5e16b25c0b3c46cca0.1658136603.git.mprivozn@redhat.com>

When "default" version of TPM was provided, our parses accepts it
happily even though the value is forbidden by our RNG and not
documented as accepted value. This is because of < 0 vs <= 0
comparison of virDomainTPMModelTypeFromString() retval.

Make the parser error out explicitly in this case. Users can
always chose to not specify the attribute in which case we pick a
sane default (in qemuDomainDefTPMsPostParse()).

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c | 2 +-
 src/conf/domain_conf.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b7147945da..6c178783af 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10400,7 +10400,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
     if (!version) {
         def->version = VIR_DOMAIN_TPM_VERSION_DEFAULT;
     } else {
-        if ((def->version = virDomainTPMVersionTypeFromString(version)) < 0) {
+        if ((def->version = virDomainTPMVersionTypeFromString(version)) <= 0) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("Unsupported TPM version '%s'"),
                            version);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5a057c36b8..7139b91aca 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1417,7 +1417,7 @@ typedef enum {
 } virDomainTPMBackendType;
 
 typedef enum {
-    VIR_DOMAIN_TPM_VERSION_DEFAULT,
+    VIR_DOMAIN_TPM_VERSION_DEFAULT = 0,
     VIR_DOMAIN_TPM_VERSION_1_2,
     VIR_DOMAIN_TPM_VERSION_2_0,
 
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:45 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:45 +0200
Subject: [PATCH 3/8] conf: Drop needless setting of
 VIR_DOMAIN_TPM_VERSION_DEFAULT
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <b22c56bd88019317a20fd3aed62100c3c93f3242.1658136603.git.mprivozn@redhat.com>

In previous commit the VIR_DOMAIN_TPM_VERSION_DEFAULT value was
made just an alias to value of 0. And since all newly allocated
memory is zeroed out (due to use of g_new0()), the def->version
inside of virDomainTPMDefParseXML() is also 0 and thus there is
no need to set it explicitly.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6c178783af..2d8989e4ff 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10397,15 +10397,12 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
     }
 
     version = virXMLPropString(backends[0], "version");
-    if (!version) {
-        def->version = VIR_DOMAIN_TPM_VERSION_DEFAULT;
-    } else {
-        if ((def->version = virDomainTPMVersionTypeFromString(version)) <= 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Unsupported TPM version '%s'"),
-                           version);
-            goto error;
-        }
+    if (version &&
+        (def->version = virDomainTPMVersionTypeFromString(version)) <= 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("Unsupported TPM version '%s'"),
+                       version);
+        goto error;
     }
 
     switch (def->type) {
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:43 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:43 +0200
Subject: [PATCH 1/8] conf: Report an error when default TPM model is provided
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <d81cb451ffaa96f2f77fe56698f2607f34f78868.1658136603.git.mprivozn@redhat.com>

When "default" model of a TPM was provided, our parses accepts it
happily even though the value is forbidden by our RNG and not
documented as accepted value. This is because of < 0 vs <= 0
comparison of virDomainTPMModelTypeFromString() retval.

Make the parser error out explicitly in this case. Users can
always chose to not specify the attribute in which case we pick a
sane default (in qemuDomainTPMDefPostParse()).

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c | 2 +-
 src/conf/domain_conf.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4c7a5a044c..b7147945da 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10360,7 +10360,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
 
     model = virXMLPropString(node, "model");
     if (model != NULL &&
-        (def->model = virDomainTPMModelTypeFromString(model)) < 0) {
+        (def->model = virDomainTPMModelTypeFromString(model)) <= 0) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("Unknown TPM frontend model '%s'"), model);
         goto error;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 90de50c12f..5a057c36b8 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1400,7 +1400,7 @@ struct _virDomainHubDef {
 };
 
 typedef enum {
-    VIR_DOMAIN_TPM_MODEL_DEFAULT,
+    VIR_DOMAIN_TPM_MODEL_DEFAULT = 0,
     VIR_DOMAIN_TPM_MODEL_TIS,
     VIR_DOMAIN_TPM_MODEL_CRB,
     VIR_DOMAIN_TPM_MODEL_SPAPR,
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:47 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:47 +0200
Subject: [PATCH 5/8] conf: Use virXMLPropEnum more when parsing TPM
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <44ef366882685c1520480244acc4d0202f2735cd.1658136603.git.mprivozn@redhat.com>

When parsing a TPM device plenty of virXMLPropString() +
enum2int() combos are used. These can be replaced with
virXMLPropEnum().

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c  | 39 ++++++++++++---------------------------
 src/conf/domain_conf.h  |  6 +++---
 src/qemu/qemu_command.c |  2 +-
 src/qemu/qemu_domain.c  |  2 +-
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 28f0e75e60..6263d90fdb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10347,9 +10347,6 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
     int nnodes;
     size_t i;
     g_autofree char *path = NULL;
-    g_autofree char *model = NULL;
-    g_autofree char *backend = NULL;
-    g_autofree char *version = NULL;
     g_autofree char *secretuuid = NULL;
     g_autofree char *persistent_state = NULL;
     g_autofree xmlNodePtr *backends = NULL;
@@ -10358,13 +10355,11 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
 
     def = g_new0(virDomainTPMDef, 1);
 
-    model = virXMLPropString(node, "model");
-    if (model != NULL &&
-        (def->model = virDomainTPMModelTypeFromString(model)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Unknown TPM frontend model '%s'"), model);
+    if (virXMLPropEnum(node, "model",
+                       virDomainTPMModelTypeFromString,
+                       VIR_XML_PROP_NONZERO,
+                       &def->model) < 0)
         goto error;
-    }
 
     ctxt->node = node;
 
@@ -10383,18 +10378,11 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
         goto error;
     }
 
-    if (!(backend = virXMLPropString(backends[0], "type"))) {
-        virReportError(VIR_ERR_XML_ERROR, "%s",
-                       _("missing TPM device backend type"));
+    if (virXMLPropEnum(backends[0], "type",
+                       virDomainTPMBackendTypeFromString,
+                       VIR_XML_PROP_REQUIRED,
+                       &def->type) < 0)
         goto error;
-    }
-
-    if ((def->type = virDomainTPMBackendTypeFromString(backend)) < 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Unknown TPM backend type '%s'"),
-                       backend);
-        goto error;
-    }
 
     switch (def->type) {
     case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
@@ -10407,14 +10395,11 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
         def->data.passthrough.source->data.file.path = g_steal_pointer(&path);
         break;
     case VIR_DOMAIN_TPM_TYPE_EMULATOR:
-        version = virXMLPropString(backends[0], "version");
-        if (version &&
-            (def->data.emulator.version = virDomainTPMVersionTypeFromString(version)) <= 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Unsupported TPM version '%s'"),
-                           version);
+        if (virXMLPropEnum(backends[0], "version",
+                           virDomainTPMVersionTypeFromString,
+                           VIR_XML_PROP_NONZERO,
+                           &def->data.emulator.version) < 0)
             goto error;
-        }
 
         if (!(def->data.emulator.source = virDomainChrSourceDefNew(xmlopt)))
             goto error;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 3362042db5..bab667d026 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1436,15 +1436,15 @@ typedef enum {
 #define VIR_DOMAIN_TPM_DEFAULT_DEVICE "/dev/tpm0"
 
 struct _virDomainTPMDef {
-    int type; /* virDomainTPMBackendType */
+    virDomainTPMModel model;
+    virDomainTPMBackendType type;
     virDomainDeviceInfo info;
-    int model; /* virDomainTPMModel */
     union {
         struct {
             virDomainChrSourceDef *source;
         } passthrough;
         struct {
-            int version; /* virDomainTPMVersion */
+            virDomainTPMVersion version;
             virDomainChrSourceDef *source;
             char *storagepath;
             char *logfile;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 262fffe5fe..93ea8748c7 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9840,7 +9840,7 @@ qemuBuildTPMCommandLine(virCommand *cmd,
     g_autoptr(qemuFDPass) passtpm = NULL;
     g_autoptr(qemuFDPass) passcancel = NULL;
 
-    switch ((virDomainTPMBackendType) tpm->type) {
+    switch (tpm->type) {
     case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: {
         VIR_AUTOCLOSE fdtpm = -1;
         VIR_AUTOCLOSE fdcancel = -1;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0343fd3597..09fc88e7fa 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11752,7 +11752,7 @@ qemuDomainDeviceBackendChardevForeachOne(virDomainDeviceDef *dev,
         return cb(dev, dev->data.rng->source.chardev, opaque);
 
     case VIR_DOMAIN_DEVICE_TPM:
-        switch ((virDomainTPMBackendType) dev->data.tpm->type) {
+        switch (dev->data.tpm->type) {
         case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
             return cb(dev, dev->data.tpm->data.passthrough.source, opaque);
 
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:48 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:48 +0200
Subject: [PATCH 6/8] qemu_domain: Move TPM post parse code into
 qemuDomainTPMDefPostParse()
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <ba082e8f048dde862c2db1994ffa72ddd1da9e53.1658136603.git.mprivozn@redhat.com>

In the qemuDomainDefPostParse() we aim to fill in top level
values, which require overall view of domain, or those parts of
configuration that are not a device in domain XML (e.g. vCPUs).
However, inside of qemuDomainDefTPMsPostParse(), which is called
from aforementioned function, we do two tings:

  1) fill in missing info (TPM version), and
  2) validate TPM definition.

Now, if 1) is moved into qemuDomainTPMDefPostParse() (the device
post parse callback), then 2) can be moved into validation step.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_domain.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 09fc88e7fa..bcee4d2602 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4593,17 +4593,6 @@ qemuDomainDefTPMsPostParse(virDomainDef *def)
     for (i = 0; i < def->ntpms; i++) {
         virDomainTPMDef *tpm = def->tpms[i];
 
-        /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */
-        if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
-            tpm->data.emulator.version == VIR_DOMAIN_TPM_VERSION_DEFAULT) {
-            if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR ||
-                tpm->model == VIR_DOMAIN_TPM_MODEL_CRB ||
-                qemuDomainIsARMVirt(def))
-                tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_2_0;
-            else
-                tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_1_2;
-        }
-
         if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY) {
             if (proxyTPM) {
                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -5806,15 +5795,26 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev,
 
 static int
 qemuDomainTPMDefPostParse(virDomainTPMDef *tpm,
-                          virArch arch)
+                          const virDomainDef *def)
 {
     if (tpm->model == VIR_DOMAIN_TPM_MODEL_DEFAULT) {
-        if (ARCH_IS_PPC64(arch))
+        if (ARCH_IS_PPC64(def->os.arch))
             tpm->model = VIR_DOMAIN_TPM_MODEL_SPAPR;
         else
             tpm->model = VIR_DOMAIN_TPM_MODEL_TIS;
     }
 
+    /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */
+    if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
+        tpm->data.emulator.version == VIR_DOMAIN_TPM_VERSION_DEFAULT) {
+        if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR ||
+            tpm->model == VIR_DOMAIN_TPM_MODEL_CRB ||
+            qemuDomainIsARMVirt(def))
+            tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_2_0;
+        else
+            tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_1_2;
+    }
+
     return 0;
 }
 
@@ -5941,7 +5941,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDef *dev,
         break;
 
     case VIR_DOMAIN_DEVICE_TPM:
-        ret = qemuDomainTPMDefPostParse(dev->data.tpm, def->os.arch);
+        ret = qemuDomainTPMDefPostParse(dev->data.tpm, def);
         break;
 
     case VIR_DOMAIN_DEVICE_MEMORY:
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:49 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:49 +0200
Subject: [PATCH 7/8] qemu: Move TPMs validation out of PostParse
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <d6b27ae9358cfba90c295d3d44f341ed12323492.1658136603.git.mprivozn@redhat.com>

After previous cleanup, the qemuDomainDefTPMsPostParse() function
does nothing more than validates TPM devices. Therefore, it
should live in qemu_validate.c instead of qemu_domain.c. Move it
there and rename to reflect the fact that the function is doing
validation instead of PostParsing.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_domain.c   | 34 ----------------------------------
 src/qemu/qemu_validate.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bcee4d2602..e3d1bb548f 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4583,37 +4583,6 @@ qemuDomainDefNumaCPUsPostParse(virDomainDef *def,
 }
 
 
-static int
-qemuDomainDefTPMsPostParse(virDomainDef *def)
-{
-    virDomainTPMDef *proxyTPM = NULL;
-    virDomainTPMDef *regularTPM = NULL;
-    size_t i;
-
-    for (i = 0; i < def->ntpms; i++) {
-        virDomainTPMDef *tpm = def->tpms[i];
-
-        if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY) {
-            if (proxyTPM) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("only a single TPM Proxy device is supported"));
-                return -1;
-            } else {
-                proxyTPM = tpm;
-            }
-        } else if (regularTPM) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("only a single TPM non-proxy device is supported"));
-            return -1;
-        } else {
-            regularTPM = tpm;
-        }
-    }
-
-    return 0;
-}
-
-
 static int
 qemuDomainDefPostParseBasic(virDomainDef *def,
                             void *opaque G_GNUC_UNUSED)
@@ -4709,9 +4678,6 @@ qemuDomainDefPostParse(virDomainDef *def,
     if (qemuDomainDefNumaCPUsPostParse(def, qemuCaps) < 0)
         return -1;
 
-    if (qemuDomainDefTPMsPostParse(def) < 0)
-        return -1;
-
     return 0;
 }
 
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index ff164118b7..ce8f92f301 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1113,6 +1113,37 @@ qemuValidateDomainDefPanic(const virDomainDef *def,
 }
 
 
+static int
+qemuValidateDomainDefTPMs(const virDomainDef *def)
+{
+    const virDomainTPMDef *proxyTPM = NULL;
+    const virDomainTPMDef *regularTPM = NULL;
+    size_t i;
+
+    for (i = 0; i < def->ntpms; i++) {
+        virDomainTPMDef *tpm = def->tpms[i];
+
+        if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY) {
+            if (proxyTPM) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("only a single TPM Proxy device is supported"));
+                return -1;
+            } else {
+                proxyTPM = tpm;
+            }
+        } else if (regularTPM) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("only a single TPM non-proxy device is supported"));
+            return -1;
+        } else {
+            regularTPM = tpm;
+        }
+    }
+
+    return 0;
+}
+
+
 int
 qemuValidateLifecycleAction(virDomainLifecycleAction onPoweroff,
                             virDomainLifecycleAction onReboot,
@@ -1310,6 +1341,9 @@ qemuValidateDomainDef(const virDomainDef *def,
     if (qemuValidateDomainDefPanic(def, qemuCaps) < 0)
         return -1;
 
+    if (qemuValidateDomainDefTPMs(def) < 0)
+        return -1;
+
     if (def->sec) {
         switch ((virDomainLaunchSecurity) def->sec->sectype) {
         case VIR_DOMAIN_LAUNCH_SECURITY_SEV:
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:50 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:50 +0200
Subject: [PATCH 8/8] conf: Don't lose <active_pcr_banks/> when no TPM version
 is provided
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <b88c06201c4dba6668b3610be2116cae425ac7ca.1658136603.git.mprivozn@redhat.com>

When no TPM version is provided in the input XML we may default
to version 2.0 (see qemuDomainTPMDefPostParse()). However,
<active_pcr_banks/> are parsed iff a version 2.0 was specified.
This means that this piece of information might be lost.

It's better to parse everything we've been given and then
validate that the configuration is valid.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2084046
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c     | 21 ++++++++++-----------
 src/conf/domain_validate.c | 28 +++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6263d90fdb..610fa5262b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10422,18 +10422,17 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
                 goto error;
             }
         }
-        if (def->data.emulator.version == VIR_DOMAIN_TPM_VERSION_2_0) {
-            if ((nnodes = virXPathNodeSet("./backend/active_pcr_banks/*", ctxt, &nodes)) < 0)
-                break;
-            for (i = 0; i < nnodes; i++) {
-                if ((bank = virDomainTPMPcrBankTypeFromString((const char *)nodes[i]->name)) < 0) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                   _("Unsupported PCR banks '%s'"),
-                                   nodes[i]->name);
-                    goto error;
-                }
-                def->data.emulator.activePcrBanks |= (1 << bank);
+
+        if ((nnodes = virXPathNodeSet("./backend/active_pcr_banks/*", ctxt, &nodes)) < 0)
+            break;
+        for (i = 0; i < nnodes; i++) {
+            if ((bank = virDomainTPMPcrBankTypeFromString((const char *)nodes[i]->name)) < 0) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("Unsupported PCR banks '%s'"),
+                               nodes[i]->name);
+                goto error;
             }
+            def->data.emulator.activePcrBanks |= (1 << bank);
         }
         break;
     case VIR_DOMAIN_TPM_TYPE_LAST:
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 814922cd46..8d4a69f127 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2611,6 +2611,30 @@ virDomainIOMMUDefValidate(const virDomainIOMMUDef *iommu)
     return 0;
 }
 
+
+static int
+virDomainTPMDevValidate(const virDomainTPMDef *tpm)
+{
+    switch (tpm->type) {
+    case VIR_DOMAIN_TPM_TYPE_EMULATOR:
+        if (tpm->data.emulator.activePcrBanks &&
+            tpm->data.emulator.version != VIR_DOMAIN_TPM_VERSION_2_0) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("<active_pcr_banks/> requires TPM version '%s'"),
+                           virDomainTPMVersionTypeToString(VIR_DOMAIN_TPM_VERSION_2_0));
+            return -1;
+        }
+        break;
+
+    case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
+    case VIR_DOMAIN_TPM_TYPE_LAST:
+        break;
+    }
+
+    return 0;
+}
+
+
 static int
 virDomainDeviceInfoValidate(const virDomainDeviceDef *dev)
 {
@@ -2715,12 +2739,14 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
     case VIR_DOMAIN_DEVICE_IOMMU:
         return virDomainIOMMUDefValidate(dev->data.iommu);
 
+    case VIR_DOMAIN_DEVICE_TPM:
+        return virDomainTPMDevValidate(dev->data.tpm);
+
     case VIR_DOMAIN_DEVICE_LEASE:
     case VIR_DOMAIN_DEVICE_WATCHDOG:
     case VIR_DOMAIN_DEVICE_HUB:
     case VIR_DOMAIN_DEVICE_MEMBALLOON:
     case VIR_DOMAIN_DEVICE_NVRAM:
-    case VIR_DOMAIN_DEVICE_TPM:
     case VIR_DOMAIN_DEVICE_PANIC:
     case VIR_DOMAIN_DEVICE_NONE:
     case VIR_DOMAIN_DEVICE_LAST:
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 09:30:46 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 11:30:46 +0200
Subject: [PATCH 4/8] conf: Move _virDomainTPMDef::version into
 _virDomainTPMDef::data::emulator
In-Reply-To: <cover.1658136603.git.mprivozn@redhat.com>
References: <cover.1658136603.git.mprivozn@redhat.com>
Message-ID: <4007b6d873957cec66becb6be627f160ac676160.1658136603.git.mprivozn@redhat.com>

The _virDomainTPMDef structure has 'version' member, which is a
bit misplaced. It's only emulator type of TPM that can have a
version, even our documentation says so:

``version``
   The ``version`` attribute indicates the version of the TPM. This attribute
   only works with the ``emulator`` backend. The following versions are
   supported:

Therefore, move the member into that part of union that's
covering emulated TPM devices.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c        | 34 +++++++++++-----------
 src/conf/domain_conf.h        |  2 +-
 src/qemu/qemu_domain.c        |  7 +++--
 src/qemu/qemu_tpm.c           | 10 ++++---
 src/qemu/qemu_validate.c      | 53 ++++++++++++++++++-----------------
 src/security/virt-aa-helper.c |  2 +-
 6 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2d8989e4ff..28f0e75e60 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10396,15 +10396,6 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
         goto error;
     }
 
-    version = virXMLPropString(backends[0], "version");
-    if (version &&
-        (def->version = virDomainTPMVersionTypeFromString(version)) <= 0) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("Unsupported TPM version '%s'"),
-                       version);
-        goto error;
-    }
-
     switch (def->type) {
     case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
         if (!(def->data.passthrough.source = virDomainChrSourceDefNew(xmlopt)))
@@ -10416,6 +10407,15 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
         def->data.passthrough.source->data.file.path = g_steal_pointer(&path);
         break;
     case VIR_DOMAIN_TPM_TYPE_EMULATOR:
+        version = virXMLPropString(backends[0], "version");
+        if (version &&
+            (def->data.emulator.version = virDomainTPMVersionTypeFromString(version)) <= 0) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("Unsupported TPM version '%s'"),
+                           version);
+            goto error;
+        }
+
         if (!(def->data.emulator.source = virDomainChrSourceDefNew(xmlopt)))
             goto error;
         secretuuid = virXPathString("string(./backend/encryption/@secret)", ctxt);
@@ -10437,7 +10437,7 @@ virDomainTPMDefParseXML(virDomainXMLOption *xmlopt,
                 goto error;
             }
         }
-        if (def->version == VIR_DOMAIN_TPM_VERSION_2_0) {
+        if (def->data.emulator.version == VIR_DOMAIN_TPM_VERSION_2_0) {
             if ((nnodes = virXPathNodeSet("./backend/active_pcr_banks/*", ctxt, &nodes)) < 0)
                 break;
             for (i = 0; i < nnodes; i++) {
@@ -20658,14 +20658,14 @@ virDomainTPMDefCheckABIStability(virDomainTPMDef *src,
         return false;
     }
 
-    if (src->version != dst->version) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("Target TPM version doesn't match source"));
-        return false;
-    }
-
     switch (src->type) {
     case VIR_DOMAIN_TPM_TYPE_EMULATOR:
+        if (src->data.emulator.version != dst->data.emulator.version) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("Target TPM version doesn't match source"));
+            return false;
+        }
+
         if (src->data.emulator.activePcrBanks != dst->data.emulator.activePcrBanks) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Target active PCR banks doesn't match source"));
@@ -24219,7 +24219,7 @@ virDomainTPMDefFormat(virBuffer *buf,
         break;
     case VIR_DOMAIN_TPM_TYPE_EMULATOR:
         virBufferAsprintf(&backendAttrBuf, " version='%s'",
-                          virDomainTPMVersionTypeToString(def->version));
+                          virDomainTPMVersionTypeToString(def->data.emulator.version));
         if (def->data.emulator.persistent_state)
             virBufferAddLit(&backendAttrBuf, " persistent_state='yes'");
         if (def->data.emulator.hassecretuuid) {
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 7139b91aca..3362042db5 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1439,12 +1439,12 @@ struct _virDomainTPMDef {
     int type; /* virDomainTPMBackendType */
     virDomainDeviceInfo info;
     int model; /* virDomainTPMModel */
-    int version; /* virDomainTPMVersion */
     union {
         struct {
             virDomainChrSourceDef *source;
         } passthrough;
         struct {
+            int version; /* virDomainTPMVersion */
             virDomainChrSourceDef *source;
             char *storagepath;
             char *logfile;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 94b2e3118c..0343fd3597 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4594,13 +4594,14 @@ qemuDomainDefTPMsPostParse(virDomainDef *def)
         virDomainTPMDef *tpm = def->tpms[i];
 
         /* TPM 1.2 and 2 are not compatible, so we choose a specific version here */
-        if (tpm->version == VIR_DOMAIN_TPM_VERSION_DEFAULT) {
+        if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
+            tpm->data.emulator.version == VIR_DOMAIN_TPM_VERSION_DEFAULT) {
             if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR ||
                 tpm->model == VIR_DOMAIN_TPM_MODEL_CRB ||
                 qemuDomainIsARMVirt(def))
-                tpm->version = VIR_DOMAIN_TPM_VERSION_2_0;
+                tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_2_0;
             else
-                tpm->version = VIR_DOMAIN_TPM_VERSION_1_2;
+                tpm->data.emulator.version = VIR_DOMAIN_TPM_VERSION_1_2;
         }
 
         if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR_PROXY) {
diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
index 03829775b8..f28dd2e1e9 100644
--- a/src/qemu/qemu_tpm.c
+++ b/src/qemu/qemu_tpm.c
@@ -575,7 +575,8 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
     if (created &&
         qemuTPMEmulatorRunSetup(tpm->data.emulator.storagepath, vmname, vmuuid,
                                 privileged, swtpm_user, swtpm_group,
-                                tpm->data.emulator.logfile, tpm->version,
+                                tpm->data.emulator.logfile,
+                                tpm->data.emulator.version,
                                 secretuuid, incomingMigration) < 0)
         goto error;
 
@@ -583,7 +584,8 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
         qemuTPMEmulatorReconfigure(tpm->data.emulator.storagepath,
                                    swtpm_user, swtpm_group,
                                    tpm->data.emulator.activePcrBanks,
-                                   tpm->data.emulator.logfile, tpm->version,
+                                   tpm->data.emulator.logfile,
+                                   tpm->data.emulator.version,
                                    secretuuid) < 0)
         goto error;
 
@@ -611,7 +613,7 @@ qemuTPMEmulatorBuildCommand(virDomainTPMDef *tpm,
     virCommandSetUID(cmd, swtpm_user);
     virCommandSetGID(cmd, swtpm_group);
 
-    switch (tpm->version) {
+    switch (tpm->data.emulator.version) {
     case VIR_DOMAIN_TPM_VERSION_1_2:
         break;
     case VIR_DOMAIN_TPM_VERSION_2_0:
@@ -684,7 +686,7 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm,
     if (!tpm->data.emulator.storagepath &&
         !(tpm->data.emulator.storagepath =
             qemuTPMEmulatorStorageBuildPath(swtpmStorageDir, uuidstr,
-                                            tpm->version)))
+                                            tpm->data.emulator.version)))
         return -1;
 
     if (!tpm->data.emulator.logfile) {
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 764d5b029e..ff164118b7 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -4760,33 +4760,34 @@ qemuValidateDomainDeviceDefTPM(virDomainTPMDef *tpm,
 {
     virDomainCapsDeviceTPM tpmCaps = { 0 };
 
-    switch (tpm->version) {
-    case VIR_DOMAIN_TPM_VERSION_1_2:
-        /* TPM 1.2 + CRB do not work */
-        if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR &&
-            tpm->model == VIR_DOMAIN_TPM_MODEL_CRB) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("Unsupported interface %s for TPM 1.2"),
-                           virDomainTPMModelTypeToString(tpm->model));
-            return -1;
+    if (tpm->type == VIR_DOMAIN_TPM_TYPE_EMULATOR) {
+        switch (tpm->data.emulator.version) {
+        case VIR_DOMAIN_TPM_VERSION_1_2:
+            /* TPM 1.2 + CRB do not work */
+            if (tpm->model == VIR_DOMAIN_TPM_MODEL_CRB) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("Unsupported interface %s for TPM 1.2"),
+                               virDomainTPMModelTypeToString(tpm->model));
+                return -1;
+            }
+            /* TPM 1.2 + SPAPR do not work with any 'type' (backend) */
+            if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("TPM 1.2 is not supported with the SPAPR device model"));
+                return -1;
+            }
+            /* TPM 1.2 + ARM does not work */
+            if (qemuDomainIsARMVirt(def)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("TPM 1.2 is not supported on ARM"));
+                return -1;
+            }
+            break;
+        case VIR_DOMAIN_TPM_VERSION_2_0:
+        case VIR_DOMAIN_TPM_VERSION_DEFAULT:
+        case VIR_DOMAIN_TPM_VERSION_LAST:
+            break;
         }
-        /* TPM 1.2 + SPAPR do not work with any 'type' (backend) */
-        if (tpm->model == VIR_DOMAIN_TPM_MODEL_SPAPR) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("TPM 1.2 is not supported with the SPAPR device model"));
-            return -1;
-        }
-        /* TPM 1.2 + ARM does not work */
-        if (qemuDomainIsARMVirt(def)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("TPM 1.2 is not supported on ARM"));
-            return -1;
-        }
-        break;
-    case VIR_DOMAIN_TPM_VERSION_2_0:
-    case VIR_DOMAIN_TPM_VERSION_DEFAULT:
-    case VIR_DOMAIN_TPM_VERSION_LAST:
-        break;
     }
 
     virQEMUCapsFillDomainDeviceTPMCaps(qemuCaps, &tpmCaps);
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index 8629503e11..2d0bc99c73 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -1212,7 +1212,7 @@ get_files(vahControl * ctl)
 
             shortName = virDomainDefGetShortName(ctl->def);
 
-            switch (ctl->def->tpms[i]->version) {
+            switch (ctl->def->tpms[i]->data.emulator.version) {
             case VIR_DOMAIN_TPM_VERSION_1_2:
                 tpmpath = "tpm1.2";
                 break;
-- 
2.35.1


From berrange at redhat.com  Mon Jul 18 09:56:52 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 10:56:52 +0100
Subject: [libvirt PATCH 1/9] qemuMonitorCPUDefInfo: Add alias
In-Reply-To: <20220628160946.61028-2-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-2-twiederh@redhat.com>
Message-ID: <YtUuZKPLCZKp6/UF@redhat.com>

On Tue, Jun 28, 2022 at 06:09:38PM +0200, Tim Wiederhake wrote:
> Preserve the "alias-of" information of the qemu response that indicates
> that the cpu model is merely an alternate name for another cpu model.
> 
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  src/qemu/qemu_monitor.c      | 2 ++
>  src/qemu/qemu_monitor.h      | 1 +
>  src/qemu/qemu_monitor_json.c | 3 +++
>  3 files changed, 6 insertions(+)

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:05:13 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:05:13 +0100
Subject: [libvirt PATCH 2/9] libvirt: introduce
 virConnectGetHypervisorCPUModelNames public API
In-Reply-To: <20220628160946.61028-3-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-3-twiederh@redhat.com>
Message-ID: <YtUwWaNJvnYnLopZ@redhat.com>

On Tue, Jun 28, 2022 at 06:09:39PM +0200, Tim Wiederhake wrote:
> Create a function to query the hypervisor for its list of known CPU model
> names. This is different from virConnectGetCPUModelNames, as this new
> function will determine the list of CPU models (and alias names) at
> runtime.

This is duplicating what we already report in the per-domain level
capabilities XML from virConnectGetDomainCapabilities.

The original virConnectGetCPUModelNames pre-dated the addition
of virConnectGetDomainCapabilities.

> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  include/libvirt/libvirt-host.h |  6 ++++
>  src/driver-hypervisor.h        |  8 +++++
>  src/libvirt-host.c             | 55 ++++++++++++++++++++++++++++++++++
>  src/libvirt_public.syms        |  1 +
>  4 files changed, 70 insertions(+)
> 
> diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
> index 3112f2b676..5aaa001adb 100644
> --- a/include/libvirt/libvirt-host.h
> +++ b/include/libvirt/libvirt-host.h
> @@ -962,6 +962,12 @@ int virConnectGetCPUModelNames(virConnectPtr conn,
>                                 char ***models,
>                                 unsigned int flags);
>  
> +int virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> +                                         const char *arch,
> +                                         char ***names,
> +                                         char ***aliases,
> +                                         unsigned int flags);

For virConnectCompareHypervisorCPU, virConnectBaselineHypervisorCPU,
and virConnectGetDomainCapabilities, we take more than just the 'arch'
value:

                                      const char *emulator,
                                      const char *arch,
                                      const char *machine,
                                      const char *virttype,

because we need all 4 of those pieces of information to accurately
determine what qemu-system-XXXX binary we're going to select.

If we do still want to add virConnectGetHypervisorCPUModelNames
despite having the info on virConnectGetDomainCapabilities, we
should take the full set of params.

I guess adding the new API isn't too costly

> +
>  /**
>   * virConnectBaselineCPUFlags:
>   *
> diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
> index 016d5cec7c..c81e5d4c75 100644
> --- a/src/driver-hypervisor.h
> +++ b/src/driver-hypervisor.h
> @@ -732,6 +732,13 @@ typedef int
>                                   char ***models,
>                                   unsigned int flags);
>  
> +typedef int
> +(*virDrvConnectGetHypervisorCPUModelNames)(virConnectPtr conn,
> +                                           const char *archName,
> +                                           char ***names,
> +                                           char ***aliases,
> +                                           unsigned int flags);
> +
>  typedef int
>  (*virDrvDomainGetJobInfo)(virDomainPtr domain,
>                            virDomainJobInfoPtr info);
> @@ -1712,4 +1719,5 @@ struct _virHypervisorDriver {
>      virDrvDomainAuthorizedSSHKeysSet domainAuthorizedSSHKeysSet;
>      virDrvDomainGetMessages domainGetMessages;
>      virDrvDomainStartDirtyRateCalc domainStartDirtyRateCalc;
> +    virDrvConnectGetHypervisorCPUModelNames connectGetHypervisorCPUModelNames;
>  };
> diff --git a/src/libvirt-host.c b/src/libvirt-host.c
> index 2ee6370bce..6e734628c1 100644
> --- a/src/libvirt-host.c
> +++ b/src/libvirt-host.c
> @@ -1234,6 +1234,61 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models,
>  }
>  
>  
> +/**
> + * virConnectGetHypervisorCPUModelNames:
> + *
> + * @conn: virConnect connection
> + * @arch: Architecture
> + * @names: Pointer to a variable to store the NULL-terminated array of the CPU
> + *         models supported by the hypervisor for the specified architecture.
> + *         Each element and the array itself must be freed by the caller.
> + * @aliases: Pointer to a variable to store the NULL-terminated array of alias
> + *           names for CPU model names. Each element and the array itself must
> + *           be freed by the caller.
> + * @flags: extra flags; not used yet, so callers should always pass 0.
> + *
> + * Get the list of CPU models supported by the hypervisor for a specific
> + * architecture.
> + *
> + * If @aliases[x] is not an empty string, @names[x] is an alias for that CPU
> + * model.
> + *
> + * Returns -1 on error, number of elements in @models on success.
> + *
> + * Since: 8.5.0
> + */
> +int
> +virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> +                                     const char *arch,
> +                                     char ***names,
> +                                     char ***aliases,
> +                                     unsigned int flags)
> +{
> +    VIR_DEBUG("conn=%p, arch=%s, flags=0x%x", conn, NULLSTR(arch), flags);
> +    virResetLastError();
> +
> +    virCheckConnectReturn(conn, -1);
> +    virCheckNonNullArgGoto(arch, error);
> +
> +    if (conn->driver->connectGetHypervisorCPUModelNames) {
> +        int ret;
> +
> +        ret = conn->driver->connectGetHypervisorCPUModelNames(conn, arch, names,
> +                                                              aliases, flags);
> +        if (ret < 0)
> +            goto error;
> +
> +        return ret;
> +    }
> +
> +    virReportUnsupportedError();
> +
> + error:
> +    virDispatchError(conn);
> +    return -1;
> +}
> +
> +
>  /**
>   * virConnectBaselineCPU:
>   *
> diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
> index 297a2c436a..c6a8e898ae 100644
> --- a/src/libvirt_public.syms
> +++ b/src/libvirt_public.syms
> @@ -924,6 +924,7 @@ LIBVIRT_8.4.0 {
>  
>  LIBVIRT_8.5.0 {
>      global:
> +        virConnectGetHypervisorCPUModelNames;
>          virDomainAbortJobFlags;
>  } LIBVIRT_8.4.0;
>  
> -- 
> 2.31.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:12:23 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:12:23 +0100
Subject: [libvirt PATCH 2/9] libvirt: introduce
 virConnectGetHypervisorCPUModelNames public API
In-Reply-To: <20220628160946.61028-3-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-3-twiederh@redhat.com>
Message-ID: <YtUyB487gLEBaox0@redhat.com>

On Tue, Jun 28, 2022 at 06:09:39PM +0200, Tim Wiederhake wrote:
> Create a function to query the hypervisor for its list of known CPU model
> names. This is different from virConnectGetCPUModelNames, as this new
> function will determine the list of CPU models (and alias names) at
> runtime.
> 
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  include/libvirt/libvirt-host.h |  6 ++++
>  src/driver-hypervisor.h        |  8 +++++
>  src/libvirt-host.c             | 55 ++++++++++++++++++++++++++++++++++
>  src/libvirt_public.syms        |  1 +
>  4 files changed, 70 insertions(+)
> 
> diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
> index 3112f2b676..5aaa001adb 100644
> --- a/include/libvirt/libvirt-host.h
> +++ b/include/libvirt/libvirt-host.h
> @@ -962,6 +962,12 @@ int virConnectGetCPUModelNames(virConnectPtr conn,
>                                 char ***models,
>                                 unsigned int flags);
>  
> +int virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> +                                         const char *arch,
> +                                         char ***names,
> +                                         char ***aliases,
> +                                         unsigned int flags);
> +
>  /**
>   * virConnectBaselineCPUFlags:
>   *
> diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
> index 016d5cec7c..c81e5d4c75 100644
> --- a/src/driver-hypervisor.h
> +++ b/src/driver-hypervisor.h
> @@ -732,6 +732,13 @@ typedef int
>                                   char ***models,
>                                   unsigned int flags);
>  
> +typedef int
> +(*virDrvConnectGetHypervisorCPUModelNames)(virConnectPtr conn,
> +                                           const char *archName,
> +                                           char ***names,
> +                                           char ***aliases,
> +                                           unsigned int flags);
> +
>  typedef int
>  (*virDrvDomainGetJobInfo)(virDomainPtr domain,
>                            virDomainJobInfoPtr info);
> @@ -1712,4 +1719,5 @@ struct _virHypervisorDriver {
>      virDrvDomainAuthorizedSSHKeysSet domainAuthorizedSSHKeysSet;
>      virDrvDomainGetMessages domainGetMessages;
>      virDrvDomainStartDirtyRateCalc domainStartDirtyRateCalc;
> +    virDrvConnectGetHypervisorCPUModelNames connectGetHypervisorCPUModelNames;
>  };
> diff --git a/src/libvirt-host.c b/src/libvirt-host.c
> index 2ee6370bce..6e734628c1 100644
> --- a/src/libvirt-host.c
> +++ b/src/libvirt-host.c
> @@ -1234,6 +1234,61 @@ virConnectGetCPUModelNames(virConnectPtr conn, const char *arch, char ***models,
>  }
>  
>  
> +/**
> + * virConnectGetHypervisorCPUModelNames:
> + *
> + * @conn: virConnect connection
> + * @arch: Architecture
> + * @names: Pointer to a variable to store the NULL-terminated array of the CPU
> + *         models supported by the hypervisor for the specified architecture.
> + *         Each element and the array itself must be freed by the caller.
> + * @aliases: Pointer to a variable to store the NULL-terminated array of alias
> + *           names for CPU model names. Each element and the array itself must
> + *           be freed by the caller.
> + * @flags: extra flags; not used yet, so callers should always pass 0.
> + *
> + * Get the list of CPU models supported by the hypervisor for a specific
> + * architecture.
> + *
> + * If @aliases[x] is not an empty string, @names[x] is an alias for that CPU
> + * model.

Why use the empty string as a marker, as opposed to NULL which
is the obvious "no data" marker ?

> + *
> + * Returns -1 on error, number of elements in @models on success.
> + *
> + * Since: 8.5.0
> + */
> +int

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:12:53 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:12:53 +0100
Subject: [libvirt PATCH 4/9] qemu: implement
 virConnectGetHypervisorCPUModelNames API
In-Reply-To: <20220628160946.61028-5-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-5-twiederh@redhat.com>
Message-ID: <YtUyJd4ELND2de+/@redhat.com>

On Tue, Jun 28, 2022 at 06:09:41PM +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  src/qemu/qemu_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 52 insertions(+)
> 
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 3b5c3db67c..538a35d327 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -17311,6 +17311,57 @@ qemuConnectGetCPUModelNames(virConnectPtr conn,
>      return virCPUGetModels(arch, models);
>  }
>  
> +static int
> +qemuConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> +                                      const char *archName,
> +                                      char ***names,
> +                                      char ***aliases,
> +                                      unsigned int flags)
> +{
> +    size_t i;
> +    virQEMUDriver *driver = conn->privateData;
> +    g_autoptr(qemuMonitorCPUDefs) cpuDefs = NULL;
> +    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
> +    g_autoptr(qemuProcessQMP) proc = NULL;
> +    g_autoptr(virQEMUCaps) qemuCaps = NULL;
> +
> +    virCheckFlags(0, -1);
> +    if (virConnectGetHypervisorCPUModelNamesEnsureACL(conn) < 0)
> +        return -1;
> +
> +    qemuCaps = virQEMUCapsCacheLookupDefault(driver->qemuCapsCache, NULL,
> +                                             archName, NULL, NULL, NULL,
> +                                             NULL, NULL);
> +
> +    if (!(proc = qemuProcessQMPNew(virQEMUCapsGetBinary(qemuCaps), cfg->libDir,
> +                                   cfg->user, cfg->group, false)))
> +        return -1;
> +
> +    if (qemuProcessQMPStart(proc) < 0)
> +        return -1;
> +
> +    if (qemuMonitorGetCPUDefinitions(proc->mon, &cpuDefs) < 0)
> +        return -1;
> +
> +    // plus one to NULL terminate the lists
> +    *names = g_new(char*, cpuDefs->ncpus + 1);
> +    *aliases = g_new(char*, cpuDefs->ncpus + 1);
> +
> +    for (i = 0; i < cpuDefs->ncpus; ++i) {
> +        if (cpuDefs->cpus[i].name)
> +            (*names)[i] = g_strdup(cpuDefs->cpus[i].name);
> +        else
> +            (*names)[i] = g_strdup("");

Why would there be a case where 'name' is NULL ?  I would have
thought that's an error scenario and qemu_monitor_json.c should
have reported a fatal error for that ? Or am i missing something ?

> +
> +        if (cpuDefs->cpus[i].alias)
> +            (*aliases)[i] = g_strdup(cpuDefs->cpus[i].alias);
> +        else
> +            (*aliases)[i] = g_strdup("");

I'd expect us to use NULL for the "no alias" marker.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:18:22 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:18:22 +0100
Subject: [libvirt PATCH 3/9] remote: Add RPC support for the
 virConnectGetHypervisorCPUModelNames API
In-Reply-To: <20220628160946.61028-4-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-4-twiederh@redhat.com>
Message-ID: <YtUzboBHwnU8PdOS@redhat.com>

On Tue, Jun 28, 2022 at 06:09:40PM +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  src/remote/remote_daemon_dispatch.c | 44 +++++++++++++++++++++
>  src/remote/remote_driver.c          | 59 +++++++++++++++++++++++++++++
>  src/remote/remote_protocol.x        | 19 +++++++++-
>  src/remote_protocol-structs         | 16 ++++++++
>  4 files changed, 137 insertions(+), 1 deletion(-)
> 
> diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
> index dc5790f077..9011977e18 100644
> --- a/src/remote/remote_daemon_dispatch.c
> +++ b/src/remote/remote_daemon_dispatch.c
> @@ -5869,6 +5869,50 @@ remoteDispatchConnectGetCPUModelNames(virNetServer *server G_GNUC_UNUSED,
>  }
>  
>  
> +static int
> +remoteDispatchConnectGetHypervisorCPUModelNames(virNetServer *server G_GNUC_UNUSED,
> +                                                virNetServerClient *client,
> +                                                virNetMessage *msg G_GNUC_UNUSED,
> +                                                struct virNetMessageError *rerr,
> +                                                remote_connect_get_hypervisor_cpu_model_names_args *args,
> +                                                remote_connect_get_hypervisor_cpu_model_names_ret *ret)
> +{
> +    int len = 0;
> +    int rv = -1;
> +    g_auto(GStrv) names = NULL;
> +    g_auto(GStrv) aliases = NULL;
> +    virConnectPtr conn = remoteGetHypervisorConn(client);
> +
> +    if (!conn)
> +        goto cleanup;
> +
> +    len = virConnectGetHypervisorCPUModelNames(conn, args->arch, &names,
> +                                               &aliases, args->flags);
> +    if (len < 0)
> +        goto cleanup;
> +
> +    if (len > REMOTE_CONNECT_CPU_MODELS_MAX) {
> +        virReportError(VIR_ERR_RPC,
> +                       _("Too many CPU models '%d' for limit '%d'"),
> +                       len, REMOTE_CONNECT_CPU_MODELS_MAX);
> +        goto cleanup;
> +    }
> +
> +    ret->names.names_val = g_steal_pointer(&names);
> +    ret->names.names_len = len;
> +    ret->aliases.aliases_val = g_steal_pointer(&aliases);
> +    ret->aliases.aliases_len = len;
> +    ret->ret = len;

'ret->ret' is not required, since both 'names' and 'aliases' already
encode the length on the wire.

> +
> +    rv = 0;
> +
> + cleanup:
> +    if (rv < 0)
> +        virNetMessageSaveError(rerr);
> +    return rv;
> +}
> +
> +
>  static int
>  remoteDispatchDomainCreateXMLWithFiles(virNetServer *server G_GNUC_UNUSED,
>                                         virNetServerClient *client,


> +static int
> +remoteConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> +                                        const char *archName,
> +                                        char ***names,
> +                                        char ***aliases,
> +                                        unsigned int flags)
> +{
> +    int rv = -1;
> +    size_t i;
> +    remote_connect_get_hypervisor_cpu_model_names_args args;
> +    remote_connect_get_hypervisor_cpu_model_names_ret ret;
> +
> +    struct private_data *priv = conn->privateData;
> +
> +    remoteDriverLock(priv);
> +
> +    args.arch = (char *) archName;
> +    args.flags = flags;
> +
> +    memset(&ret, 0, sizeof(ret));
> +    if (call(conn, priv, 0, REMOTE_PROC_CONNECT_GET_HYPERVISOR_CPU_MODEL_NAMES,
> +             (xdrproc_t) xdr_remote_connect_get_hypervisor_cpu_model_names_args,
> +             (char *) &args,
> +             (xdrproc_t) xdr_remote_connect_get_hypervisor_cpu_model_names_ret,
> +             (char *) &ret) < 0)
> +        goto done;
> +
> +    /* Check the length of the returned list carefully. */
> +    if (ret.names.names_len > REMOTE_CONNECT_CPU_MODELS_MAX) {
> +        virReportError(VIR_ERR_RPC,
> +                       _("Too many model names '%d' for limit '%d'"),
> +                       ret.names.names_len,
> +                       REMOTE_CONNECT_CPU_MODELS_MAX);
> +        goto cleanup;
> +    }

Also validate  ret.names.names_len == ret.aliases.aliases_len

> +
> +    *names = g_new0(char *, ret.names.names_len + 1);
> +    for (i = 0; i < ret.names.names_len; i++) {
> +        (*names)[i] = g_steal_pointer(&ret.names.names_val[i]);
> +    }
> +
> +    *aliases = g_new0(char *, ret.aliases.aliases_len + 1);
> +    for (i = 0; i < ret.aliases.aliases_len; i++) {
> +        (*aliases)[i] = g_steal_pointer(&ret.aliases.aliases_val[i]);
> +    }
> +
> +    rv = ret.ret;
> +
> + cleanup:
> +    xdr_free((xdrproc_t) xdr_remote_connect_get_hypervisor_cpu_model_names_ret,
> +             (char *) &ret);
> +
> + done:
> +    remoteDriverUnlock(priv);
> +    return rv;
> +}
> +


> diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
> index 79ffc63f03..a5c60399c7 100644
> --- a/src/remote/remote_protocol.x
> +++ b/src/remote/remote_protocol.x
> @@ -3303,6 +3303,17 @@ struct remote_connect_get_cpu_model_names_ret {
>      int ret;
>  };
>  
> +struct remote_connect_get_hypervisor_cpu_model_names_args {
> +    remote_nonnull_string arch;
> +    unsigned int flags;
> +};
> +
> +struct remote_connect_get_hypervisor_cpu_model_names_ret {
> +    remote_nonnull_string names<REMOTE_CONNECT_CPU_MODELS_MAX>;
> +    remote_nonnull_string aliases<REMOTE_CONNECT_CPU_MODELS_MAX>;

I'd expect 'remote_string', since aliases should be able to be NULL

> +    int ret;

Drop 'ret'

> +};
> +

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:21:48 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:21:48 +0100
Subject: [libvirt PATCH 5/9] tools: Report hypervisor cpu model names
In-Reply-To: <20220628160946.61028-6-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-6-twiederh@redhat.com>
Message-ID: <YtU0PP+2zPHUGPbe@redhat.com>

On Tue, Jun 28, 2022 at 06:09:42PM +0200, Tim Wiederhake wrote:
> $ virsh hypervisor-cpu-models --arch x86_64
>  Name                        Alias
> ----------------------------------------------------
>  max
>  host
>  base
>  qemu64-v1
>  qemu64                      qemu64-v1
>  qemu32-v1
>  qemu32                      qemu32-v1
>  phenom-v1
>  phenom                      phenom-v1
> (...)
> 
> Note that this includes alias names and cpu models that currently
> do not exist in libvirt, e.g. Denverton and Knights Mill.
> 
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  docs/manpages/virsh.rst | 14 +++++++++
>  tools/virsh-host.c      | 67 +++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 81 insertions(+)
> 
> diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
> index 45469f2f35..a55792b0e2 100644
> --- a/docs/manpages/virsh.rst
> +++ b/docs/manpages/virsh.rst
> @@ -955,6 +955,20 @@ If *--validate* is specified, validates the format of the XML document against
>  an internal RNG schema.
>  
>  
> +hypervisor-cpu-models
> +---------------------
> +
> +**Syntax:**
> +
> +::
> +
> +   hypervisor-cpu-models [arch]
> +
> +List the names of cpu models known to the hypervisor. A hypervisor may define
> +alias names for some or all cpu models. Note that the cpu models may differ
> +from libvirt, even if named identically.
> +
> +
>  hypervisor-cpu-baseline
>  -----------------------
>  
> diff --git a/tools/virsh-host.c b/tools/virsh-host.c
> index ead966b500..cb8e1e8c6d 100644
> --- a/tools/virsh-host.c
> +++ b/tools/virsh-host.c
> @@ -32,6 +32,7 @@
>  #include "virstring.h"
>  #include "virfile.h"
>  #include "virenum.h"
> +#include "vsh-table.h"
>  
>  /*
>   * "capabilities" command
> @@ -1674,6 +1675,65 @@ cmdHypervisorCPUCompare(vshControl *ctl,
>  }
>  
>  
> +/*
> + * "hypervisor-cpu-models" command
> + */
> +static const vshCmdInfo info_hypervisor_cpu_models[] = {
> +    {.name = "help",
> +     .data = N_("return list of CPU models supported by a specific hypervisor")
> +    },
> +    {.name = "desc",
> +     .data = N_("Return list of CPU models supported by a specific hypervisor")
> +    },
> +    {.name = NULL}
> +};
> +
> +static const vshCmdOptDef opts_hypervisor_cpu_models[] = {
> +    {.name = "arch",
> +     .type = VSH_OT_STRING,
> +     .completer = virshArchCompleter,
> +     .help = N_("CPU architecture (/domain/os/type/@arch)"),
> +    },
> +    {.name = NULL}
> +};

This will need to be expanded to  add machine, virttype and
emulator to match the API params.


> +    nresults = virConnectGetHypervisorCPUModelNames(priv->conn, arch, &name,
> +                                                    &alias, 0);

Should we do sorting here or somewhere earlier in the flow ?

I notice the existing 'cpu-models' doesn't do sorting just returning
stuff in a pretty horrible random order.

I think both this new API and the old one should sort case insensitive.

> +    if (nresults >= 0) {
> +        size_t index;
> +        for (index = 0; index < nresults; ++index) {
> +            if (vshTableRowAppend(table, name[index], alias[index], NULL) < 0)
> +                return ret;
> +            g_free(name[index]);
> +            g_free(alias[index]);
> +        }
> +        ret = true;
> +    }
> +    vshTablePrintToStdout(table, ctl);
> +    g_free(name);
> +    g_free(alias);
> +
> +    return ret;
> +}
> +
>  /*
>   * "hypervisor-cpu-baseline" command
>   */
> @@ -1819,6 +1879,13 @@ const vshCmdDef hostAndHypervisorCmds[] = {
>       .info = info_hostname,
>       .flags = 0
>      },
> +    {
> +     .name = "hypervisor-cpu-models",
> +     .handler = cmdHypervisorCPUModels,
> +     .opts = opts_hypervisor_cpu_models,
> +     .info = info_hypervisor_cpu_models,
> +     .flags = 0
> +    },
>      {.name = "hypervisor-cpu-baseline",
>       .handler = cmdHypervisorCPUBaseline,
>       .opts = opts_hypervisor_cpu_baseline,
> -- 
> 2.31.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:22:48 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:22:48 +0100
Subject: [libvirt PATCH 2/9] libvirt: introduce
 virConnectGetHypervisorCPUModelNames public API
In-Reply-To: <20220628160946.61028-3-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-3-twiederh@redhat.com>
Message-ID: <YtU0eCwxVoTNgav2@redhat.com>

On Tue, Jun 28, 2022 at 06:09:39PM +0200, Tim Wiederhake wrote:
> Create a function to query the hypervisor for its list of known CPU model
> names. This is different from virConnectGetCPUModelNames, as this new
> function will determine the list of CPU models (and alias names) at
> runtime.
> 
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  include/libvirt/libvirt-host.h |  6 ++++
>  src/driver-hypervisor.h        |  8 +++++
>  src/libvirt-host.c             | 55 ++++++++++++++++++++++++++++++++++
>  src/libvirt_public.syms        |  1 +
>  4 files changed, 70 insertions(+)
> 
> diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
> index 3112f2b676..5aaa001adb 100644
> --- a/include/libvirt/libvirt-host.h
> +++ b/include/libvirt/libvirt-host.h
> @@ -962,6 +962,12 @@ int virConnectGetCPUModelNames(virConnectPtr conn,
>                                 char ***models,
>                                 unsigned int flags);
>  
> +int virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> +                                         const char *arch,
> +                                         char ***names,
> +                                         char ***aliases,
> +                                         unsigned int flags);

We have a notion of deprecation for CPU models.

I wonder if we should include or omit deprecated CPU models by
default, possibly determined based on a flag ?


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:24:00 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:24:00 +0100
Subject: [libvirt PATCH 2/9] libvirt: introduce
 virConnectGetHypervisorCPUModelNames public API
In-Reply-To: <YtUwWaNJvnYnLopZ@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-3-twiederh@redhat.com>
 <YtUwWaNJvnYnLopZ@redhat.com>
Message-ID: <YtU0wD3LvzgIHuok@redhat.com>

On Mon, Jul 18, 2022 at 11:05:13AM +0100, Daniel P. Berrang? wrote:
> On Tue, Jun 28, 2022 at 06:09:39PM +0200, Tim Wiederhake wrote:
> > Create a function to query the hypervisor for its list of known CPU model
> > names. This is different from virConnectGetCPUModelNames, as this new
> > function will determine the list of CPU models (and alias names) at
> > runtime.
> 
> This is duplicating what we already report in the per-domain level
> capabilities XML from virConnectGetDomainCapabilities.
> 
> The original virConnectGetCPUModelNames pre-dated the addition
> of virConnectGetDomainCapabilities.
> 
> > Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> > ---
> >  include/libvirt/libvirt-host.h |  6 ++++
> >  src/driver-hypervisor.h        |  8 +++++
> >  src/libvirt-host.c             | 55 ++++++++++++++++++++++++++++++++++
> >  src/libvirt_public.syms        |  1 +
> >  4 files changed, 70 insertions(+)
> > 
> > diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
> > index 3112f2b676..5aaa001adb 100644
> > --- a/include/libvirt/libvirt-host.h
> > +++ b/include/libvirt/libvirt-host.h
> > @@ -962,6 +962,12 @@ int virConnectGetCPUModelNames(virConnectPtr conn,
> >                                 char ***models,
> >                                 unsigned int flags);
> >  
> > +int virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> > +                                         const char *arch,
> > +                                         char ***names,
> > +                                         char ***aliases,
> > +                                         unsigned int flags);
> 
> For virConnectCompareHypervisorCPU, virConnectBaselineHypervisorCPU,
> and virConnectGetDomainCapabilities, we take more than just the 'arch'
> value:
> 
>                                       const char *emulator,
>                                       const char *arch,
>                                       const char *machine,
>                                       const char *virttype,
> 
> because we need all 4 of those pieces of information to accurately
> determine what qemu-system-XXXX binary we're going to select.
> 
> If we do still want to add virConnectGetHypervisorCPUModelNames
> despite having the info on virConnectGetDomainCapabilities, we
> should take the full set of params.
> 
> I guess adding the new API isn't too costly

Now I've read forward in the series, I see that there is no
update to virConnectGetDomainCapabilities. I would expect that
to be updated to reflect the alias information, as well as
exposing the same list of CPUs as this new API.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:26:07 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:26:07 +0100
Subject: [libvirt PATCH 6/9] libvirt: introduce
 virConnectGetHypervisorCPUModelDefinition public API
In-Reply-To: <20220628160946.61028-7-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-7-twiederh@redhat.com>
Message-ID: <YtU1P7Z9eKw16isv@redhat.com>

On Tue, Jun 28, 2022 at 06:09:43PM +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  include/libvirt/libvirt-host.h |  7 +++++
>  src/driver-hypervisor.h        |  9 ++++++
>  src/libvirt-host.c             | 54 ++++++++++++++++++++++++++++++++++
>  src/libvirt_public.syms        |  1 +
>  4 files changed, 71 insertions(+)
> 
> diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
> index 5aaa001adb..ad11c1172d 100644
> --- a/include/libvirt/libvirt-host.h
> +++ b/include/libvirt/libvirt-host.h
> @@ -968,6 +968,13 @@ int virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
>                                           char ***aliases,
>                                           unsigned int flags);
>  
> +int virConnectGetHypervisorCPUModelDefinition(virConnectPtr conn,
> +                                              const char *arch,
> +                                              const char *machine,

Now we've got machine + arch, but still haven't got 'virttype' and
'emulator' parameters

> +                                              const char *name,
> +                                              char **xmlCPU,
> +                                              unsigned int flags);
> +


> diff --git a/src/libvirt-host.c b/src/libvirt-host.c
> index 6e734628c1..8875f67a7b 100644
> --- a/src/libvirt-host.c
> +++ b/src/libvirt-host.c
> @@ -1288,6 +1288,60 @@ virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
>      return -1;
>  }
>  
> +/**
> + * virConnectGetHypervisorCPUModelDefinition:
> + *
> + * @conn: virConnect connection
> + * @arch: Architecture
> + * @machine: Machine type

Should be optional, defaulting to the default machine type if omitted.

For that matter, arch should be optional too

> + * @name: CPU model name
> + * @xmlCPU: XML description of the CPUs
> + * @flags: extra flags; not used yet, so callers should always pass 0.
> + *
> + * Get the description of a specific hypervisor cpu model for a given machine
> + * type and architecture.
> + *
> + * Returns 0 on success, -1 otherwise.
> + *
> + * Since: 8.5.0
> + */
> +int
> +virConnectGetHypervisorCPUModelDefinition(virConnectPtr conn,
> +                                          const char *arch,
> +                                          const char *machine,
> +                                          const char *name,
> +                                          char **xmlCPU,
> +                                          unsigned int flags)
> +{
> +    VIR_DEBUG("conn=%p, arch=%s, machine=%s, model=%s, flags=0x%x", conn,
> +              NULLSTR(arch), NULLSTR(machine), NULLSTR(name), flags);
> +    virResetLastError();
> +
> +    virCheckConnectReturn(conn, -1);
> +    virCheckNonNullArgGoto(arch, error);
> +    virCheckNonNullArgGoto(machine, error);
> +    virCheckNonNullArgGoto(name, error);
> +
> +    if (conn->driver->connectGetHypervisorCPUModelDefinition) {
> +        int ret;
> +
> +        ret = conn->driver->connectGetHypervisorCPUModelDefinition(conn, arch,
> +                                                                   machine,
> +                                                                   name,
> +                                                                   xmlCPU,
> +                                                                   flags);
> +        if (ret < 0)
> +            goto error;
> +
> +        return ret;
> +    }
> +
> +    virReportUnsupportedError();
> +
> + error:
> +    virDispatchError(conn);
> +    return -1;
> +}
>  
>  /**
>   * virConnectBaselineCPU:
> diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
> index c6a8e898ae..15ef29d07d 100644
> --- a/src/libvirt_public.syms
> +++ b/src/libvirt_public.syms
> @@ -924,6 +924,7 @@ LIBVIRT_8.4.0 {
>  
>  LIBVIRT_8.5.0 {
>      global:
> +        virConnectGetHypervisorCPUModelDefinition;
>          virConnectGetHypervisorCPUModelNames;
>          virDomainAbortJobFlags;
>  } LIBVIRT_8.4.0;
> -- 
> 2.31.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:27:09 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:27:09 +0100
Subject: [libvirt PATCH 7/9] remote: Add support for the
 virConnectGetHypervisorCPUModelDefinition API
In-Reply-To: <20220628160946.61028-8-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-8-twiederh@redhat.com>
Message-ID: <YtU1fSzjUVJW28fK@redhat.com>

On Tue, Jun 28, 2022 at 06:09:44PM +0200, Tim Wiederhake wrote:
> Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> ---
>  src/remote/remote_daemon_dispatch.c | 32 ++++++++++++++++++++++
>  src/remote/remote_driver.c          | 41 +++++++++++++++++++++++++++++
>  src/remote/remote_protocol.x        | 20 +++++++++++++-
>  src/remote_protocol-structs         | 11 ++++++++
>  4 files changed, 103 insertions(+), 1 deletion(-)


> diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
> index a5c60399c7..2d7d6277c6 100644
> --- a/src/remote/remote_protocol.x
> +++ b/src/remote/remote_protocol.x
> @@ -3314,6 +3314,18 @@ struct remote_connect_get_hypervisor_cpu_model_names_ret {
>      int ret;
>  };
>  
> +struct remote_connect_get_hypervisor_cpu_model_definition_args {
> +    remote_nonnull_string arch;
> +    remote_nonnull_string machine;
> +    remote_nonnull_string name;
> +    unsigned int flags;
> +};
> +
> +struct remote_connect_get_hypervisor_cpu_model_definition_ret {
> +    remote_nonnull_string xml;
> +    int ret;
> +};

'ret' should not be here, as errors are encoded separately on
the wire.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:40:17 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:40:17 +0100
Subject: [libvirt PATCH 0/9] [RFC] Dynamic CPU models
In-Reply-To: <20220628160946.61028-1-twiederh@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
Message-ID: <YtU4kWWX3XjNZYBU@redhat.com>

On Tue, Jun 28, 2022 at 06:09:37PM +0200, Tim Wiederhake wrote:
> libvirt and qemu cpu models are out of sync. libvirt cpu models are
> considered static and never changing, whereas qemu cpu models have
> changed over time. This leads to problems and confusion for users,
> as the cpu models they specify may have different features than what
> they expect.
> 
> This series introduces two new APIs to enumerate and retrieve cpu
> models dynamically from the hypervisor at runtime, allowing the user
> to make use of cpu models from newer hypervisor versions even if
> libvirt is not aware of them.
>
> These two new functions are intended as building blocks onto which
> higher-level functionality can be build, e.g. the ability to specify
> a hypervisor cpu model directly in a domain xml. With these two
> functions alone this has to be done manually for now, i.e. enumerate
> the available cpu models, retrieve the cpu description and manually
> insert it into the domain xml accordingly:

This series only reports the new CPU models/features. I'm not seeing
any changes to allow the user to actually use them in a new VM, as
libvirt rejects models it doesn't know of:

# virsh edit demo
 ...
  <cpu mode='custom' match='exact' check='partial'>
    <model fallback='allow'>Nehalem-v1</model>
  </cpu>

# virsh start demo
error: Failed to start domain 'demo'
error: internal error: Unknown CPU model Nehalem-v1


>     $ virsh hypervisor-cpu-models --arch x86_64
>     Name                        Alias
>     ----------------------------------------------------
>     max
>     host
>     base
>     qemu64-v1
>     qemu64                      qemu64-v1
>     qemu32-v1
>     qemu32                      qemu32-v1
>     phenom-v1
>     phenom                      phenom-v1
>     (...)
> 
>     $ virsh hypervisor-cpu-definition --machine pc --arch x86_64 qemu64
>     <cpu>
>       <model>qemu64</model>
>       <feature name='cmov'/>
>       <feature name='mmx'/>
>       <feature name='xd'/>
>       <feature name='x-intel-pt-auto-level'/>
>       <feature name='kvm_asyncpf'/>
>       <feature name='kvm-asyncpf'/>
>       <feature name='legacy-cache'/>
>       <feature name='vmware-cpuid-freq'/>
>       <feature name='mce'/>
>       <feature name='mca'/>
>       <feature name='msr'/>
>       <feature name='fxsr'/>
>       <feature name='cpuid-0xb'/>
>       <feature name='kvm_pv_eoi'/>
>       <feature name='pni'/>
>       <feature name='x2apic'/>
>       <feature name='i64'/>
>       <feature name='pae'/>
>       <feature name='pat'/>
>       <feature name='sse'/>
>       <feature name='kvm_nopiodelay'/>
>       <feature name='kvm-nopiodelay'/>
>       <feature name='kvmclock-stable-bit'/>
>       <feature name='hypervisor'/>
>       <feature name='syscall'/>
>       <feature name='x-migrate-smi-count'/>
>       <feature name='full-cpuid-auto-level'/>
>       <feature name='sse3'/>
>       <feature name='sse2'/>
>       <feature name='kvm-pv-eoi'/>
>       <feature name='cx8'/>
>       <feature name='pge'/>
>       <feature name='fill-mtrr-mask'/>
>       <feature name='cx16'/>
>       <feature name='de'/>
>       <feature name='clflush'/>
>       <feature name='tsc'/>
>       <feature name='fpu'/>
>       <feature name='check'/>
>       <feature name='apic'/>
>       <feature name='kvm-steal-time'/>
>       <feature name='kvm_steal_time'/>
>       <feature name='kvmclock'/>
>       <feature name='l3-cache'/>
>       <feature name='nx'/>
>       <feature name='tcg-cpuid'/>
>       <feature name='lm'/>
>       <feature name='pse'/>
>       <feature name='sep'/>
>       <feature name='kvm'/>
>       <feature name='lahf-lm'/>
>       <feature name='lahf_lm'/>
>       <feature name='mtrr'/>
>       <feature name='pse36'/>
>     </cpu>
> 
> The returned cpu description is currently completely unfiltered, as
> can be seen by the duplicate entries differing only in "-" vs. "_"
> usage, inclusion of experimental feature flags and generally, flags
> that are not recognized by libvirt. One possibility to adress this
> would be to extend virQEMUCapsCPUFeatureTranslate.

The duplicated feature names are really bad IMHO, as as the (few)
cases where QEMU names diverge from libvirt names.

I don't mind us exposing CPU versions that we don't have in our
XML database, but directly exposing new features and base CPU
models IMHO is not desirable. A really key point of libvirt is
to define a (thin) abstraction over the hypervisor, not blindly
expose its low level platform specific terminology.

> Before I continue with this, I would love to hear other people's
> thoughts, comments and potential use cases.

Before we actually add these APIs we need to actually be able to
use the resulting CPU models to run guests, otherwise there's
nothing useful that can be done with this new information reported.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Mon Jul 18 10:41:32 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 18 Jul 2022 11:41:32 +0100
Subject: [libvirt PATCH 6/9] libvirt: introduce
 virConnectGetHypervisorCPUModelDefinition public API
In-Reply-To: <YtU1P7Z9eKw16isv@redhat.com>
References: <20220628160946.61028-1-twiederh@redhat.com>
 <20220628160946.61028-7-twiederh@redhat.com>
 <YtU1P7Z9eKw16isv@redhat.com>
Message-ID: <YtU43HhiOuiDk/K8@redhat.com>

On Mon, Jul 18, 2022 at 11:26:07AM +0100, Daniel P. Berrang? wrote:
> On Tue, Jun 28, 2022 at 06:09:43PM +0200, Tim Wiederhake wrote:
> > Signed-off-by: Tim Wiederhake <twiederh at redhat.com>
> > ---
> >  include/libvirt/libvirt-host.h |  7 +++++
> >  src/driver-hypervisor.h        |  9 ++++++
> >  src/libvirt-host.c             | 54 ++++++++++++++++++++++++++++++++++
> >  src/libvirt_public.syms        |  1 +
> >  4 files changed, 71 insertions(+)
> > 
> > diff --git a/include/libvirt/libvirt-host.h b/include/libvirt/libvirt-host.h
> > index 5aaa001adb..ad11c1172d 100644
> > --- a/include/libvirt/libvirt-host.h
> > +++ b/include/libvirt/libvirt-host.h
> > @@ -968,6 +968,13 @@ int virConnectGetHypervisorCPUModelNames(virConnectPtr conn,
> >                                           char ***aliases,
> >                                           unsigned int flags);
> >  
> > +int virConnectGetHypervisorCPUModelDefinition(virConnectPtr conn,
> > +                                              const char *arch,
> > +                                              const char *machine,
> 
> Now we've got machine + arch, but still haven't got 'virttype' and
> 'emulator' parameters
> 
> > +                                              const char *name,
> > +                                              char **xmlCPU,
> > +                                              unsigned int flags);
> > +

I'm not actually convinced this new API is needed at all. Thue
virConnectBaselineHypervisorCPU API has a flag
VIR_CONNECT_BASELINE_CPU_EXPAND_FEATURES to let you expand all
features in a given CPU model name.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mprivozn at redhat.com  Mon Jul 18 14:03:14 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 16:03:14 +0200
Subject: [PATCH 0/2] Fix build with glib-2.73.2
Message-ID: <cover.1658152911.git.mprivozn@redhat.com>

See the first patch for explanation. The second is just a cleanup so
that we don't have to care about glib for some time.

Michal Pr?vozn?k (2):
  glibcompat: Provide implementation for G_GNUC_NO_INLINE
  lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE

 docs/coding-style.rst           |  2 +-
 scripts/cocci-macro-file.h      |  2 +-
 scripts/mock-noinline.py        |  4 ++--
 src/cpu/cpu.h                   |  2 +-
 src/internal.h                  | 12 ------------
 src/libxl/libxl_capabilities.h  |  2 +-
 src/qemu/qemu_capabilities.h    |  2 +-
 src/qemu/qemu_capspriv.h        |  2 +-
 src/qemu/qemu_command.h         |  4 ++--
 src/qemu/qemu_hotplug.c         |  2 +-
 src/qemu/qemu_hotplug.h         |  2 +-
 src/qemu/qemu_interface.h       |  4 ++--
 src/qemu/qemu_monitor.h         |  2 +-
 src/qemu/qemu_monitor_json.h    |  2 +-
 src/qemu/qemu_monitor_priv.h    |  2 +-
 src/qemu/qemu_process.h         |  6 +++---
 src/rpc/virnetsocket.h          |  4 ++--
 src/util/glibcompat.h           | 21 +++++++++++++++++++++
 src/util/vircgroupv2devices.h   |  2 +-
 src/util/vircommand.h           |  2 +-
 src/util/virdevmapper.h         |  2 +-
 src/util/virfile.h              | 18 +++++++++---------
 src/util/virhashcode.h          |  2 +-
 src/util/virhostcpu.h           |  6 +++---
 src/util/virhostmem.h           |  2 +-
 src/util/virhostuptime.h        |  2 +-
 src/util/viridentitypriv.h      |  2 +-
 src/util/virmacaddr.h           |  2 +-
 src/util/virnetdev.h            | 10 +++++-----
 src/util/virnetdevbandwidth.h   |  2 +-
 src/util/virnetdevip.h          |  2 +-
 src/util/virnetdevmacvlan.h     |  2 +-
 src/util/virnetdevopenvswitch.h |  2 +-
 src/util/virnetdevtap.h         |  6 +++---
 src/util/virnuma.h              | 18 +++++++++---------
 src/util/virprocess.h           |  6 +++---
 src/util/virrandom.h            |  6 +++---
 src/util/virscsi.h              |  2 +-
 src/util/virscsivhost.h         |  2 +-
 src/util/virtpm.h               |  2 +-
 src/util/virutil.h              | 16 ++++++++--------
 src/util/viruuid.h              |  4 ++--
 42 files changed, 103 insertions(+), 94 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 14:03:16 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 16:03:16 +0200
Subject: [PATCH 2/2] lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE
In-Reply-To: <cover.1658152911.git.mprivozn@redhat.com>
References: <cover.1658152911.git.mprivozn@redhat.com>
Message-ID: <91d5eff2c780f8bb96315047638e7b7aee1a40d5.1658152911.git.mprivozn@redhat.com>

The G_GNUC_NO_INLINE macro will eventually be marked as
deprecated [1] and we are recommended to use G_NO_INLINE instead.
Do the switch now, rather than waiting for compile time warning
to occur.

1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/coding-style.rst           |  2 +-
 scripts/cocci-macro-file.h      |  2 +-
 scripts/mock-noinline.py        |  4 ++--
 src/cpu/cpu.h                   |  2 +-
 src/libxl/libxl_capabilities.h  |  2 +-
 src/qemu/qemu_capabilities.h    |  2 +-
 src/qemu/qemu_capspriv.h        |  2 +-
 src/qemu/qemu_command.h         |  4 ++--
 src/qemu/qemu_hotplug.c         |  2 +-
 src/qemu/qemu_hotplug.h         |  2 +-
 src/qemu/qemu_interface.h       |  4 ++--
 src/qemu/qemu_monitor.h         |  2 +-
 src/qemu/qemu_monitor_json.h    |  2 +-
 src/qemu/qemu_monitor_priv.h    |  2 +-
 src/qemu/qemu_process.h         |  6 +++---
 src/rpc/virnetsocket.h          |  4 ++--
 src/util/glibcompat.h           | 28 ++++++++++++++++++++--------
 src/util/vircgroupv2devices.h   |  2 +-
 src/util/vircommand.h           |  2 +-
 src/util/virdevmapper.h         |  2 +-
 src/util/virfile.h              | 18 +++++++++---------
 src/util/virhashcode.h          |  2 +-
 src/util/virhostcpu.h           |  6 +++---
 src/util/virhostmem.h           |  2 +-
 src/util/virhostuptime.h        |  2 +-
 src/util/viridentitypriv.h      |  2 +-
 src/util/virmacaddr.h           |  2 +-
 src/util/virnetdev.h            | 10 +++++-----
 src/util/virnetdevbandwidth.h   |  2 +-
 src/util/virnetdevip.h          |  2 +-
 src/util/virnetdevmacvlan.h     |  2 +-
 src/util/virnetdevopenvswitch.h |  2 +-
 src/util/virnetdevtap.h         |  6 +++---
 src/util/virnuma.h              | 18 +++++++++---------
 src/util/virprocess.h           |  6 +++---
 src/util/virrandom.h            |  6 +++---
 src/util/virscsi.h              |  2 +-
 src/util/virscsivhost.h         |  2 +-
 src/util/virtpm.h               |  2 +-
 src/util/virutil.h              | 16 ++++++++--------
 src/util/viruuid.h              |  4 ++--
 41 files changed, 102 insertions(+), 90 deletions(-)

diff --git a/docs/coding-style.rst b/docs/coding-style.rst
index cb23751721..bf0a80fbc5 100644
--- a/docs/coding-style.rst
+++ b/docs/coding-style.rst
@@ -628,7 +628,7 @@ analysis tools understand the code better:
 ``G_GNUC_FALLTHROUGH``
    allow code reuse by multiple switch cases
 
-``G_GNUC_NO_INLINE``
+``G_NO_INLINE``
    the function is mocked in the test suite
 
 ``G_GNUC_NORETURN``
diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h
index 4e6d218a97..c3112663d1 100644
--- a/scripts/cocci-macro-file.h
+++ b/scripts/cocci-macro-file.h
@@ -28,7 +28,7 @@
 #define G_GNUC_UNUSED
 #define G_GNUC_NULL_TERMINATED
 #define G_GNUC_NORETURN
-#define G_GNUC_NO_INLINE
+#define G_NO_INLINE
 #define G_GNUC_FALLTHROUGH
 #define G_GNUC_PRINTF(a, b)
 
diff --git a/scripts/mock-noinline.py b/scripts/mock-noinline.py
index 13c296603d..ec617bbc2b 100644
--- a/scripts/mock-noinline.py
+++ b/scripts/mock-noinline.py
@@ -43,7 +43,7 @@ def scan_annotations(filename):
             elif line.isspace():
                 func = None
 
-            if "G_GNUC_NO_INLINE" in line:
+            if "G_NO_INLINE" in line:
                 if func is not None:
                     noninlined[func] = True
 
@@ -73,7 +73,7 @@ warned = False
 for func in mocked.keys():
     if func not in noninlined:
         warned = True
-        print("%s is mocked at %s but missing 'G_GNUC_NO_INLINE' annotation" %
+        print("%s is mocked at %s but missing 'G_NO_INLINE' annotation" %
               (func, mocked[func]), file=sys.stderr)
 
 if warned:
diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
index 06b5858ef3..41a62ce486 100644
--- a/src/cpu/cpu.h
+++ b/src/cpu/cpu.h
@@ -212,7 +212,7 @@ virCPUGetHost(virArch arch,
               virDomainCapsCPUModels *models);
 
 virCPUDef *
-virCPUProbeHost(virArch arch) G_GNUC_NO_INLINE;
+virCPUProbeHost(virArch arch) G_NO_INLINE;
 
 virCPUDef *
 virCPUBaseline(virArch arch,
diff --git a/src/libxl/libxl_capabilities.h b/src/libxl/libxl_capabilities.h
index 6611786dd5..fd6332b63e 100644
--- a/src/libxl/libxl_capabilities.h
+++ b/src/libxl/libxl_capabilities.h
@@ -47,4 +47,4 @@ libxlMakeDomainCapabilities(virDomainCaps *domCaps,
 
 int
 libxlDomainGetEmulatorType(const virDomainDef *def)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 67769fcfe4..d979a5ba3b 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -845,7 +845,7 @@ virSEVCapability *
 virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps);
 
 bool
-virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_GNUC_NO_INLINE;
+virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_NO_INLINE;
 
 virArch virQEMUCapsArchFromString(const char *arch);
 const char *virQEMUCapsArchToString(virArch arch);
diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index fe24d01342..87368536ea 100644
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -85,7 +85,7 @@ virQEMUCapsGetCPUModelX86Data(virQEMUCaps *qemuCaps,
 
 virCPUDef *
 virQEMUCapsProbeHostCPU(virArch hostArch,
-                        virDomainCapsCPUModels *models) G_GNUC_NO_INLINE;
+                        virDomainCapsCPUModels *models) G_NO_INLINE;
 
 void
 virQEMUCapsSetGICCapabilities(virQEMUCaps *qemuCaps,
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index f8e9d71e81..6d2adcfc16 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -67,7 +67,7 @@ int qemuBuildTLSx509BackendProps(const char *tlspath,
 
 /* Open a UNIX socket for chardev FD passing */
 int
-qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) G_GNUC_NO_INLINE;
+qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev) G_NO_INLINE;
 
 virJSONValue *
 qemuBuildChrDeviceProps(const virDomainDef *vmdef,
@@ -238,7 +238,7 @@ int
 qemuBuildTPMOpenBackendFDs(const char *tpmdev,
                            int *tpmfd,
                            int *cancelfd)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) G_NO_INLINE;
 
 const char * qemuAudioDriverTypeToString(virDomainAudioType type);
 virDomainAudioType qemuAudioDriverTypeFromString(const char *str);
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 27e68370cf..6bc160de4a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -5281,7 +5281,7 @@ qemuDomainResetDeviceRemoval(virDomainObj *vm)
 }
 
 
-unsigned long long G_GNUC_NO_INLINE
+unsigned long long G_NO_INLINE
 qemuDomainGetUnplugTimeout(virDomainObj *vm)
 {
     if (qemuDomainIsPSeries(vm->def))
diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h
index 2b1e8085a4..f769bf6477 100644
--- a/src/qemu/qemu_hotplug.h
+++ b/src/qemu/qemu_hotplug.h
@@ -159,7 +159,7 @@ int qemuDomainSetVcpuInternal(virQEMUDriver *driver,
                               virBitmap *vcpus,
                               bool state);
 
-unsigned long long qemuDomainGetUnplugTimeout(virDomainObj *vm) G_GNUC_NO_INLINE;
+unsigned long long qemuDomainGetUnplugTimeout(virDomainObj *vm) G_NO_INLINE;
 
 int qemuHotplugAttachDBusVMState(virQEMUDriver *driver,
                                  virDomainObj *vm,
diff --git a/src/qemu/qemu_interface.h b/src/qemu/qemu_interface.h
index d7ac6e6fc9..d866beb184 100644
--- a/src/qemu/qemu_interface.h
+++ b/src/qemu/qemu_interface.h
@@ -51,9 +51,9 @@ int qemuInterfaceBridgeConnect(virDomainDef *def,
     ATTRIBUTE_NONNULL(2);
 
 int qemuInterfaceOpenVhostNet(virDomainObj *def,
-                              virDomainNetDef *net) G_GNUC_NO_INLINE;
+                              virDomainNetDef *net) G_NO_INLINE;
 
 int qemuInterfacePrepareSlirp(virQEMUDriver *driver,
                               virDomainNetDef *net);
 
-int qemuInterfaceVDPAConnect(virDomainNetDef *net) G_GNUC_NO_INLINE;
+int qemuInterfaceVDPAConnect(virDomainNetDef *net) G_NO_INLINE;
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index f7e01f71fe..cc1a0bc8c9 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -435,7 +435,7 @@ int qemuMonitorSetLink(qemuMonitor *mon,
 /* These APIs are for use by the internal Text/JSON monitor impl code only */
 char *qemuMonitorNextCommandID(qemuMonitor *mon);
 int qemuMonitorSend(qemuMonitor *mon,
-                    qemuMonitorMessage *msg) G_GNUC_NO_INLINE;
+                    qemuMonitorMessage *msg) G_NO_INLINE;
 int qemuMonitorUpdateVideoMemorySize(qemuMonitor *mon,
                                      virDomainVideoDef *video,
                                      const char *videoName)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 7006aa8c46..2759566892 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -31,7 +31,7 @@ int
 qemuMonitorJSONIOProcessLine(qemuMonitor *mon,
                              const char *line,
                              qemuMonitorMessage *msg)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int
 qemuMonitorJSONIOProcess(qemuMonitor *mon,
diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h
index 05ac5499bb..2f7c662cef 100644
--- a/src/qemu/qemu_monitor_priv.h
+++ b/src/qemu/qemu_monitor_priv.h
@@ -101,4 +101,4 @@ qemuMonitorIOWriteWithFD(qemuMonitor *mon,
                          const char *data,
                          size_t len,
                          int fd)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 0fddae0bbb..55296e54e8 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -117,7 +117,7 @@ int qemuProcessPrepareHostHostdev(virDomainHostdevDef *hostdev);
 
 int qemuProcessPrepareHostBackendChardevHotplug(virDomainObj *vm,
                                                 virDomainDeviceDef *dev)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 
 int qemuProcessPrepareHost(virQEMUDriver *driver,
@@ -205,9 +205,9 @@ int qemuProcessRefreshDisks(virQEMUDriver *driver,
                             virDomainObj *vm,
                             virDomainAsyncJob asyncJob);
 
-int qemuProcessStartManagedPRDaemon(virDomainObj *vm) G_GNUC_NO_INLINE;
+int qemuProcessStartManagedPRDaemon(virDomainObj *vm) G_NO_INLINE;
 
-void qemuProcessKillManagedPRDaemon(virDomainObj *vm) G_GNUC_NO_INLINE;
+void qemuProcessKillManagedPRDaemon(virDomainObj *vm) G_NO_INLINE;
 
 typedef struct _qemuProcessQMP qemuProcessQMP;
 struct _qemuProcessQMP {
diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h
index 6fef8d30b3..fec84ca068 100644
--- a/src/rpc/virnetsocket.h
+++ b/src/rpc/virnetsocket.h
@@ -132,10 +132,10 @@ int virNetSocketGetUNIXIdentity(virNetSocket *sock,
                                 gid_t *gid,
                                 pid_t *pid,
                                 unsigned long long *timestamp)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 int virNetSocketGetSELinuxContext(virNetSocket *sock,
                                   char **context)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virNetSocketSetBlocking(virNetSocket *sock,
                             bool blocking);
diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
index e3a8b9f6b3..02f8ec090c 100644
--- a/src/util/glibcompat.h
+++ b/src/util/glibcompat.h
@@ -95,11 +95,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args)
 
 void vir_g_source_unref(GSource *src, GMainContext *ctx);
 
-/* Intentionally redefine macro so that it's not marked as available in 2.58
- * and newer. Drop when bumping to 2.58 or newer. */
-#undef G_GNUC_NO_INLINE
-#if g_macro__has_attribute(__noinline__)
-# define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
-#else
-# define G_GNUC_NO_INLINE
-#endif
+#if !GLIB_CHECK_VERSION(2, 73, 0)
+# if (defined(__has_attribute) && __has_attribute(__noinline__)) || G_GNUC_CHECK_VERSION (2, 96)
+#  if defined (__cplusplus) && __cplusplus >= 201103L
+    /* Use ISO C++11 syntax when the compiler supports it. */
+#   define G_NO_INLINE [[gnu::noinline]]
+#  else
+#   define G_NO_INLINE __attribute__ ((__noinline__))
+#  endif
+# elif defined (_MSC_VER) && (1200 <= _MSC_VER)
+   /* Use MSVC specific syntax.  */
+#  if defined (__cplusplus) && __cplusplus >= 201103L
+    /* Use ISO C++11 syntax when the compiler supports it. */
+#   define G_NO_INLINE [[msvc::noinline]]
+#  else
+#   define G_NO_INLINE __declspec (noinline)
+#  endif
+# else
+#  define G_NO_INLINE /* empty */
+# endif
+#endif /* GLIB_CHECK_VERSION(2, 73, 0) */
diff --git a/src/util/vircgroupv2devices.h b/src/util/vircgroupv2devices.h
index 1ff46987e8..d2d769ba5a 100644
--- a/src/util/vircgroupv2devices.h
+++ b/src/util/vircgroupv2devices.h
@@ -26,7 +26,7 @@
 
 bool
 virCgroupV2DevicesAvailable(virCgroup *group)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int
 virCgroupV2DevicesDetectProg(virCgroup *group);
diff --git a/src/util/vircommand.h b/src/util/vircommand.h
index 21ef8ff663..c7a580e152 100644
--- a/src/util/vircommand.h
+++ b/src/util/vircommand.h
@@ -54,7 +54,7 @@ typedef enum {
 
 void virCommandPassFD(virCommand *cmd,
                       int fd,
-                      unsigned int flags) G_GNUC_NO_INLINE;
+                      unsigned int flags) G_NO_INLINE;
 
 void virCommandSetPidFile(virCommand *cmd,
                           const char *pidfile) ATTRIBUTE_NONNULL(2);
diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
index 4d8d3ccdb8..6972050bc5 100644
--- a/src/util/virdevmapper.h
+++ b/src/util/virdevmapper.h
@@ -24,7 +24,7 @@
 
 int
 virDevMapperGetTargets(const char *path,
-                       GSList **devPaths) G_GNUC_NO_INLINE;
+                       GSList **devPaths) G_NO_INLINE;
 
 bool
 virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 8e378efe30..4af1ad9136 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -119,9 +119,9 @@ int virFileWrapperFdClose(virFileWrapperFd *dfd);
 void virFileWrapperFdFree(virFileWrapperFd *dfd);
 
 int virFileLock(int fd, bool shared, off_t start, off_t len, bool waitForLock)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 int virFileUnlock(int fd, off_t start, off_t len)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 typedef int (*virFileRewriteFunc)(int fd,
                                   const char *path,
@@ -188,7 +188,7 @@ int virFileIsLink(const char *linkpath)
     ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT;
 
 char *virFindFileInPath(const char *file)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 char *virFileFindResource(const char *filename,
                           const char *builddir,
@@ -207,7 +207,7 @@ void virFileActivateDirOverrideForLib(void);
 
 off_t virFileLength(const char *path, int fd) ATTRIBUTE_NONNULL(1);
 bool virFileIsDir (const char *file) ATTRIBUTE_NONNULL(1);
-bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) G_GNUC_NO_INLINE;
+bool virFileExists(const char *file) ATTRIBUTE_NONNULL(1) G_NO_INLINE;
 bool virFileIsExecutable(const char *file) ATTRIBUTE_NONNULL(1);
 bool virFileIsRegular(const char *file) ATTRIBUTE_NONNULL(1);
 
@@ -241,7 +241,7 @@ int virFileGetMountReverseSubtree(const char *mtabpath,
                                   size_t *nmountsret) G_GNUC_WARN_UNUSED_RESULT;
 
 char *virFileSanitizePath(const char *path);
-char *virFileCanonicalizePath(const char *path) G_GNUC_NO_INLINE;
+char *virFileCanonicalizePath(const char *path) G_NO_INLINE;
 
 enum {
     VIR_FILE_OPEN_NONE        = 0,
@@ -363,21 +363,21 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(virFileWrapperFd, virFileWrapperFdFree);
 int virFileGetXAttr(const char *path,
                     const char *name,
                     char **value)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virFileGetXAttrQuiet(const char *path,
                          const char *name,
                          char **value)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virFileSetXAttr(const char *path,
                     const char *name,
                     const char *value)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virFileRemoveXAttr(const char *path,
                        const char *name)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virFileDataSync(int fd);
 
diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h
index 10d8451795..5c68e5a89a 100644
--- a/src/util/virhashcode.h
+++ b/src/util/virhashcode.h
@@ -30,4 +30,4 @@
 #include "internal.h"
 
 uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index 86a231daa2..b8ea7aafad 100644
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -45,7 +45,7 @@ virBitmap *virHostCPUGetOnlineBitmap(void);
 virBitmap *virHostCPUGetAvailableCPUsBitmap(void);
 
 int virHostCPUGetCount(void);
-int virHostCPUGetThreadsPerSubcore(virArch arch) G_GNUC_NO_INLINE;
+int virHostCPUGetThreadsPerSubcore(virArch arch) G_NO_INLINE;
 
 int virHostCPUGetMap(unsigned char **cpumap,
                      unsigned int *online,
@@ -58,7 +58,7 @@ int virHostCPUGetInfo(virArch hostarch,
                       unsigned int *cores,
                       unsigned int *threads);
 
-int virHostCPUGetKVMMaxVCPUs(void) G_GNUC_NO_INLINE;
+int virHostCPUGetKVMMaxVCPUs(void) G_NO_INLINE;
 
 int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
                           const char *name,
@@ -75,7 +75,7 @@ virBitmap *virHostCPUGetSiblingsList(unsigned int cpu);
 int virHostCPUGetOnline(unsigned int cpu, bool *online);
 
 unsigned int
-virHostCPUGetMicrocodeVersion(virArch hostArch) G_GNUC_NO_INLINE;
+virHostCPUGetMicrocodeVersion(virArch hostArch) G_NO_INLINE;
 
 int virHostCPUGetMSR(unsigned long index,
                      uint64_t *msr);
diff --git a/src/util/virhostmem.h b/src/util/virhostmem.h
index c36de94f0f..79e1a300a8 100644
--- a/src/util/virhostmem.h
+++ b/src/util/virhostmem.h
@@ -57,4 +57,4 @@ int virHostMemAllocPages(unsigned int npages,
                          bool add);
 
 int virHostMemGetTHPSize(unsigned long long *size)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
diff --git a/src/util/virhostuptime.h b/src/util/virhostuptime.h
index 1ac638fd6e..44a91b5b52 100644
--- a/src/util/virhostuptime.h
+++ b/src/util/virhostuptime.h
@@ -24,7 +24,7 @@
 
 int
 virHostGetBootTime(unsigned long long *when)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int
 virHostBootTimeInit(void);
diff --git a/src/util/viridentitypriv.h b/src/util/viridentitypriv.h
index e5ca8430f8..63357d891a 100644
--- a/src/util/viridentitypriv.h
+++ b/src/util/viridentitypriv.h
@@ -27,4 +27,4 @@
 #include "viridentity.h"
 
 char *
-virIdentityEnsureSystemToken(void) G_GNUC_NO_INLINE;
+virIdentityEnsureSystemToken(void) G_NO_INLINE;
diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h
index 1a46565fe6..f32b58805a 100644
--- a/src/util/virmacaddr.h
+++ b/src/util/virmacaddr.h
@@ -49,7 +49,7 @@ void virMacAddrGetRaw(const virMacAddr *src, unsigned char dst[VIR_MAC_BUFLEN]);
 const char *virMacAddrFormat(const virMacAddr *addr,
                              char *str);
 void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN],
-                        virMacAddr *addr) G_GNUC_NO_INLINE;
+                        virMacAddr *addr) G_NO_INLINE;
 int virMacAddrParse(const char* str,
                     virMacAddr *addr) G_GNUC_WARN_UNUSED_RESULT;
 int virMacAddrParseHex(const char* str,
diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 790fae5f7a..05daed09e9 100644
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -168,11 +168,11 @@ int virNetDevSetupControl(const char *ifname,
     G_GNUC_WARN_UNUSED_RESULT;
 
 int virNetDevExists(const char *brname)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 int virNetDevSetOnline(const char *ifname,
                        bool online)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 int virNetDevGetOnline(const char *ifname,
                       bool *online)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
@@ -180,7 +180,7 @@ int virNetDevGetOnline(const char *ifname,
 
 int virNetDevSetMAC(const char *ifname,
                     const virMacAddr *macaddr)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 int virNetDevGetMAC(const char *ifname,
                     virMacAddr *macaddr)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
@@ -324,10 +324,10 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link,
                        const char *ifname,
                        const char *file)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 int virNetDevRunEthernetScript(const char *ifname, const char *script)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virNetDevVFInterfaceStats(virPCIDeviceAddress *vfAddr,
                               virDomainInterfaceStatsPtr stats)
diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h
index c82029fc0f..6d268fb119 100644
--- a/src/util/virnetdevbandwidth.h
+++ b/src/util/virnetdevbandwidth.h
@@ -77,4 +77,4 @@ int virNetDevBandwidthUpdateFilter(const char *ifname,
 
 int virNetDevBandwidthSetRootQDisc(const char *ifname,
                                    const char *qdisc)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h
index 136048090d..fdf116f509 100644
--- a/src/util/virnetdevip.h
+++ b/src/util/virnetdevip.h
@@ -59,7 +59,7 @@ int virNetDevIPAddrAdd(const char *ifname,
                        virSocketAddr *addr,
                        virSocketAddr *peer,
                        unsigned int prefix)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 int virNetDevIPRouteAdd(const char *ifname,
                         virSocketAddr *addr,
                         unsigned int prefix,
diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h
index 405e48088f..29bb8123f4 100644
--- a/src/util/virnetdevmacvlan.h
+++ b/src/util/virnetdevmacvlan.h
@@ -47,7 +47,7 @@ typedef enum {
 } virNetDevMacVLanCreateFlags;
 
 bool virNetDevMacVLanIsMacvtap(const char *ifname)
-   ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+   ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 int virNetDevMacVLanCreate(const char *ifname,
                            const virMacAddr *macaddress,
diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h
index b16c8fe318..e6ee985f17 100644
--- a/src/util/virnetdevopenvswitch.h
+++ b/src/util/virnetdevopenvswitch.h
@@ -65,7 +65,7 @@ virNetDevOpenvswitchMaybeUnescapeReply(char *reply)
 int virNetDevOpenvswitchGetVhostuserIfname(const char *path,
                                            bool server,
                                            char **ifname)
-    ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 int virNetDevOpenvswitchUpdateVlan(const char *ifname,
                                    const virNetDevVlan *virtVlan)
diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h
index 922682adae..197ea10f94 100644
--- a/src/util/virnetdevtap.h
+++ b/src/util/virnetdevtap.h
@@ -34,7 +34,7 @@ int virNetDevTapCreate(char **ifname,
                        int *tapfd,
                        size_t tapfdSize,
                        unsigned int flags)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 int virNetDevTapDelete(const char *ifname,
                        const char *tunpath)
@@ -44,7 +44,7 @@ int virNetDevTapGetName(int tapfd, char **ifname)
     ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
 
 char* virNetDevTapGetRealDeviceName(char *ifname)
-      ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+      ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 typedef enum {
    VIR_NETDEV_TAP_CREATE_NONE = 0,
@@ -99,7 +99,7 @@ int virNetDevTapCreateInBridgePort(const char *brname,
                                    unsigned int *actualMTU,
                                    unsigned int flags)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
+    G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
 
 int virNetDevTapInterfaceStats(const char *ifname,
                                virDomainInterfaceStatsPtr stats,
diff --git a/src/util/virnuma.h b/src/util/virnuma.h
index bc79bff891..c35acd47cb 100644
--- a/src/util/virnuma.h
+++ b/src/util/virnuma.h
@@ -32,20 +32,20 @@ int virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode,
                              virBitmap *nodeset);
 
 virBitmap *virNumaGetHostMemoryNodeset(void);
-bool virNumaNodesetIsAvailable(virBitmap *nodeset) G_GNUC_NO_INLINE;
-bool virNumaIsAvailable(void) G_GNUC_NO_INLINE;
-int virNumaGetMaxNode(void) G_GNUC_NO_INLINE;
-bool virNumaNodeIsAvailable(int node) G_GNUC_NO_INLINE;
+bool virNumaNodesetIsAvailable(virBitmap *nodeset) G_NO_INLINE;
+bool virNumaIsAvailable(void) G_NO_INLINE;
+int virNumaGetMaxNode(void) G_NO_INLINE;
+bool virNumaNodeIsAvailable(int node) G_NO_INLINE;
 int virNumaGetDistances(int node,
                         int **distances,
-                        int *ndistances) G_GNUC_NO_INLINE;
+                        int *ndistances) G_NO_INLINE;
 int virNumaGetNodeMemory(int node,
                          unsigned long long *memsize,
-                         unsigned long long *memfree) G_GNUC_NO_INLINE;
+                         unsigned long long *memfree) G_NO_INLINE;
 
-unsigned int virNumaGetMaxCPUs(void) G_GNUC_NO_INLINE;
+unsigned int virNumaGetMaxCPUs(void) G_NO_INLINE;
 
-int virNumaGetNodeCPUs(int node, virBitmap **cpus) G_GNUC_NO_INLINE;
+int virNumaGetNodeCPUs(int node, virBitmap **cpus) G_NO_INLINE;
 int virNumaNodesetToCPUset(virBitmap *nodeset,
                            virBitmap **cpuset);
 
@@ -59,7 +59,7 @@ int virNumaGetPages(int node,
                     unsigned long long **pages_avail,
                     unsigned long long **pages_free,
                     size_t *npages)
-    ATTRIBUTE_NONNULL(5) G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(5) G_NO_INLINE;
 int virNumaSetPagePoolSize(int node,
                            unsigned int page_size,
                            unsigned long long page_count,
diff --git a/src/util/virprocess.h b/src/util/virprocess.h
index 086fbe0e4d..30b6981c73 100644
--- a/src/util/virprocess.h
+++ b/src/util/virprocess.h
@@ -77,12 +77,12 @@ int virProcessGetNamespaces(pid_t pid,
 int virProcessSetNamespaces(size_t nfdlist,
                             int *fdlist);
 
-int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) G_GNUC_NO_INLINE;
+int virProcessSetMaxMemLock(pid_t pid, unsigned long long bytes) G_NO_INLINE;
 int virProcessSetMaxProcesses(pid_t pid, unsigned int procs);
 int virProcessSetMaxFiles(pid_t pid, unsigned int files);
 int virProcessSetMaxCoreSize(pid_t pid, unsigned long long bytes);
 
-int virProcessGetMaxMemLock(pid_t pid, unsigned long long *bytes) G_GNUC_NO_INLINE;
+int virProcessGetMaxMemLock(pid_t pid, unsigned long long *bytes) G_NO_INLINE;
 
 /* Callback to run code within the mount namespace tied to the given
  * pid.  This function must use only async-signal-safe functions, as
@@ -110,7 +110,7 @@ typedef int (*virProcessForkCallback)(pid_t ppid,
 
 int virProcessRunInFork(virProcessForkCallback cb,
                         void *opaque)
-    G_GNUC_NO_INLINE;
+    G_NO_INLINE;
 
 int virProcessSetupPrivateMountNS(void);
 
diff --git a/src/util/virrandom.h b/src/util/virrandom.h
index aac684ada9..8a20401954 100644
--- a/src/util/virrandom.h
+++ b/src/util/virrandom.h
@@ -20,10 +20,10 @@
 
 #include "internal.h"
 
-uint64_t virRandomBits(int nbits) G_GNUC_NO_INLINE;
+uint64_t virRandomBits(int nbits) G_NO_INLINE;
 double virRandom(void);
 uint32_t virRandomInt(uint32_t max);
 int virRandomBytes(unsigned char *buf, size_t buflen)
-    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_GNUC_NO_INLINE;
-int virRandomGenerateWWN(char **wwn, const char *virt_type) G_GNUC_NO_INLINE;
+    ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT G_NO_INLINE;
+int virRandomGenerateWWN(char **wwn, const char *virt_type) G_NO_INLINE;
 char *virRandomToken(size_t len);
diff --git a/src/util/virscsi.h b/src/util/virscsi.h
index 65ad15ed76..ec34303bdc 100644
--- a/src/util/virscsi.h
+++ b/src/util/virscsi.h
@@ -34,7 +34,7 @@ char *virSCSIDeviceGetSgName(const char *sysfs_prefix,
                              const char *adapter,
                              unsigned int bus,
                              unsigned int target,
-                             unsigned long long unit) G_GNUC_NO_INLINE;
+                             unsigned long long unit) G_NO_INLINE;
 char *virSCSIDeviceGetDevName(const char *sysfs_prefix,
                               const char *adapter,
                               unsigned int bus,
diff --git a/src/util/virscsivhost.h b/src/util/virscsivhost.h
index d030aea397..a7299382db 100644
--- a/src/util/virscsivhost.h
+++ b/src/util/virscsivhost.h
@@ -57,6 +57,6 @@ void virSCSIVHostDeviceGetUsedBy(virSCSIVHostDevice *dev,
                                  const char **drv_name,
                                  const char **dom_name);
 void virSCSIVHostDeviceFree(virSCSIVHostDevice *dev);
-int virSCSIVHostOpenVhostSCSI(int *vhostfd) G_GNUC_NO_INLINE;
+int virSCSIVHostOpenVhostSCSI(int *vhostfd) G_NO_INLINE;
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSCSIVHostDevice, virSCSIVHostDeviceFree);
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index bbf379a54a..89adbdf720 100644
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-char *virTPMCreateCancelPath(const char *devpath) G_GNUC_NO_INLINE;
+char *virTPMCreateCancelPath(const char *devpath) G_NO_INLINE;
 
 char *virTPMGetSwtpm(void);
 char *virTPMGetSwtpmSetup(void);
diff --git a/src/util/virutil.h b/src/util/virutil.h
index 6adebde242..ab8511bf8d 100644
--- a/src/util/virutil.h
+++ b/src/util/virutil.h
@@ -89,17 +89,17 @@ static inline int pthread_sigmask(int how,
 }
 #endif
 
-char *virGetHostname(void) G_GNUC_NO_INLINE;
+char *virGetHostname(void) G_NO_INLINE;
 char *virGetHostnameQuiet(void);
 
 char *virGetUserDirectory(void);
 char *virGetUserDirectoryByUID(uid_t uid);
 char *virGetUserConfigDirectory(void);
 char *virGetUserCacheDirectory(void);
-char *virGetUserRuntimeDirectory(void) G_GNUC_NO_INLINE;
+char *virGetUserRuntimeDirectory(void) G_NO_INLINE;
 char *virGetUserShell(uid_t uid);
-char *virGetUserName(uid_t uid) G_GNUC_NO_INLINE;
-char *virGetGroupName(gid_t gid) G_GNUC_NO_INLINE;
+char *virGetUserName(uid_t uid) G_NO_INLINE;
+char *virGetGroupName(gid_t gid) G_NO_INLINE;
 int virGetGroupList(uid_t uid, gid_t group, gid_t **groups)
     ATTRIBUTE_NONNULL(3);
 int virGetUserID(const char *name,
@@ -119,16 +119,16 @@ int virParseOwnershipIds(const char *label, uid_t *uidPtr, gid_t *gidPtr);
 time_t virGetSelfLastChanged(void);
 void virUpdateSelfLastChanged(const char *path);
 
-long virGetSystemPageSize(void) G_GNUC_NO_INLINE;
-long virGetSystemPageSizeKB(void) G_GNUC_NO_INLINE;
+long virGetSystemPageSize(void) G_NO_INLINE;
+long virGetSystemPageSizeKB(void) G_NO_INLINE;
 
 unsigned long long virMemoryLimitTruncate(unsigned long long value);
 bool virMemoryLimitIsSet(unsigned long long value);
-unsigned long long virMemoryMaxValue(bool ulong) G_GNUC_NO_INLINE;
+unsigned long long virMemoryMaxValue(bool ulong) G_NO_INLINE;
 
 bool virHostHasIOMMU(void);
 
-char *virHostGetDRMRenderNode(void) G_GNUC_NO_INLINE;
+char *virHostGetDRMRenderNode(void) G_NO_INLINE;
 
 /* Kernel cmdline match and comparison strategy for arg=value pairs */
 typedef enum {
diff --git a/src/util/viruuid.h b/src/util/viruuid.h
index b403b1906a..9667bd3200 100644
--- a/src/util/viruuid.h
+++ b/src/util/viruuid.h
@@ -41,11 +41,11 @@
 
 
 int virSetHostUUIDStr(const char *host_uuid);
-int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1) G_GNUC_NO_INLINE;
+int virGetHostUUID(unsigned char *host_uuid) ATTRIBUTE_NONNULL(1) G_NO_INLINE;
 
 bool virUUIDIsValid(const unsigned char *uuid);
 
-int virUUIDGenerate(unsigned char *uuid) G_GNUC_NO_INLINE;
+int virUUIDGenerate(unsigned char *uuid) G_NO_INLINE;
 
 int virUUIDParse(const char *uuidstr,
                  unsigned char *uuid)
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 14:03:15 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 16:03:15 +0200
Subject: [PATCH 1/2] glibcompat: Provide implementation for G_GNUC_NO_INLINE
In-Reply-To: <cover.1658152911.git.mprivozn@redhat.com>
References: <cover.1658152911.git.mprivozn@redhat.com>
Message-ID: <66b3023d43f9af5a239c84e3ca3ff93fd09a9508.1658152911.git.mprivozn@redhat.com>

Currently, we require glib-2.56.0 at minimum (because of RHEL-8)
but we use G_GNUC_NO_INLINE which was introduced in 2.58.0. While
we provide an implementation for older versions, where the macro
does not exists, it's a bit more tricky than that. Since we
define GLIB_VERSION_MAX_ALLOWED we would get a compile time error
when trying to use something too new, except for G_GNUC_NO_INLINE
which was intentionally not marked as
GLIB_AVAILABLE_MACRO_IN_2_58. But this is about to change with
glib-2.73.2 (which contains commit [1]).

At the same time, we can't just bump glib and thus we have to
provide an alternative implementation without the version
annotation.

1: https://gitlab.gnome.org/GNOME/glib/-/commit/a6f8fe071e44b0145619c21f3bfbc90c56ab805e
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/internal.h        | 12 ------------
 src/util/glibcompat.h |  9 +++++++++
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/internal.h b/src/internal.h
index 4cfb022b41..1e8e2908bf 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -109,18 +109,6 @@
 # endif
 #endif
 
-/**
- * G_GNUC_NO_INLINE:
- *
- * Force compiler not to inline a method. Should be used if
- * the method need to be overridable by test mocks.
- *
- * TODO: Remove after upgrading to GLib >= 2.58
- */
-#ifndef G_GNUC_NO_INLINE
-# define G_GNUC_NO_INLINE __attribute__((__noinline__))
-#endif
-
 /**
  * ATTRIBUTE_PACKED
  *
diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
index 1f3a6f728f..e3a8b9f6b3 100644
--- a/src/util/glibcompat.h
+++ b/src/util/glibcompat.h
@@ -94,3 +94,12 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args)
 #define g_fsync vir_g_fsync
 
 void vir_g_source_unref(GSource *src, GMainContext *ctx);
+
+/* Intentionally redefine macro so that it's not marked as available in 2.58
+ * and newer. Drop when bumping to 2.58 or newer. */
+#undef G_GNUC_NO_INLINE
+#if g_macro__has_attribute(__noinline__)
+# define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
+#else
+# define G_GNUC_NO_INLINE
+#endif
-- 
2.35.1


From phrdina at redhat.com  Mon Jul 18 14:49:39 2022
From: phrdina at redhat.com (Pavel Hrdina)
Date: Mon, 18 Jul 2022 16:49:39 +0200
Subject: [PATCH 1/2] glibcompat: Provide implementation for
 G_GNUC_NO_INLINE
In-Reply-To: <66b3023d43f9af5a239c84e3ca3ff93fd09a9508.1658152911.git.mprivozn@redhat.com>
References: <cover.1658152911.git.mprivozn@redhat.com>
 <66b3023d43f9af5a239c84e3ca3ff93fd09a9508.1658152911.git.mprivozn@redhat.com>
Message-ID: <YtVzA64qmpzdatty@antique-laptop>

On Mon, Jul 18, 2022 at 04:03:15PM +0200, Michal Privoznik wrote:
> Currently, we require glib-2.56.0 at minimum (because of RHEL-8)
> but we use G_GNUC_NO_INLINE which was introduced in 2.58.0. While
> we provide an implementation for older versions, where the macro
> does not exists, it's a bit more tricky than that. Since we
> define GLIB_VERSION_MAX_ALLOWED we would get a compile time error
> when trying to use something too new, except for G_GNUC_NO_INLINE
> which was intentionally not marked as
> GLIB_AVAILABLE_MACRO_IN_2_58. But this is about to change with
> glib-2.73.2 (which contains commit [1]).
> 
> At the same time, we can't just bump glib and thus we have to
> provide an alternative implementation without the version
> annotation.
> 
> 1: https://gitlab.gnome.org/GNOME/glib/-/commit/a6f8fe071e44b0145619c21f3bfbc90c56ab805e
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/internal.h        | 12 ------------
>  src/util/glibcompat.h |  9 +++++++++
>  2 files changed, 9 insertions(+), 12 deletions(-)

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220718/e44899c4/attachment.sig>

From mprivozn at redhat.com  Mon Jul 18 14:50:00 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 16:50:00 +0200
Subject: [PATCH 0/2] qemu_hotplug: Fix two issues with chardev hotplug
Message-ID: <cover.1658155738.git.mprivozn@redhat.com>

And while at it, make the code 5 lines shorter.

Michal Pr?vozn?k (2):
  qemu_hotplug: Close FDs in QEMU on failed chardev hotplug
  qemu_hotplug: Create chardev files before attempting to relabel them

 src/qemu/qemu_hotplug.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 14:50:02 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 16:50:02 +0200
Subject: [PATCH 2/2] qemu_hotplug: Create chardev files before attempting to
 relabel them
In-Reply-To: <cover.1658155738.git.mprivozn@redhat.com>
References: <cover.1658155738.git.mprivozn@redhat.com>
Message-ID: <37d992ee496f3e63639d575d6530d24dc20e2ca1.1658155738.git.mprivozn@redhat.com>

When hotplugging a chardev, Libvirt opens corresponding
file/binds to a socket/does whatever necessary to obtain an FD
that is later passed to QEMU. However, due to wrong placement of
the function that does all of this
(qemuProcessPrepareHostBackendChardevHotplug()) it may happen
that a file is set seclabel on, only to be unlink()-ed and
created again (the former is done by
qemuSecuritySetChardevLabel(), the latter by aforementioned
function). The unlink()-ing is done for UNIX sockets with
mode='bind' and happens inside qemuOpenChrChardevUNIXSocket().
However, these steps can be swapped simply.

Fixes: ad81aa8ad07e52c9bd4840de84d2ed59998b4d2a
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_hotplug.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index fac893c80e..38a010423f 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2115,6 +2115,9 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver,
     if (qemuDomainAttachChrDeviceAssignAddr(vm, chr, &need_release) < 0)
         goto cleanup;
 
+    if (qemuProcessPrepareHostBackendChardevHotplug(vm, dev) < 0)
+        goto cleanup;
+
     if (qemuDomainNamespaceSetupChardev(vm, chr, &teardowndevice) < 0)
         goto cleanup;
 
@@ -2126,9 +2129,6 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver,
         goto cleanup;
     teardowncgroup = true;
 
-    if (qemuProcessPrepareHostBackendChardevHotplug(vm, dev) < 0)
-        goto cleanup;
-
     if (guestfwd) {
         if (!(netdevprops = qemuBuildChannelGuestfwdNetdevProps(chr)))
             goto cleanup;
-- 
2.35.1


From mprivozn at redhat.com  Mon Jul 18 14:50:01 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 18 Jul 2022 16:50:01 +0200
Subject: [PATCH 1/2] qemu_hotplug: Close FDs in QEMU on failed chardev hotplug
In-Reply-To: <cover.1658155738.git.mprivozn@redhat.com>
References: <cover.1658155738.git.mprivozn@redhat.com>
Message-ID: <70fc16be273f60da3e4c4c595f000d62433a3d84.1658155738.git.mprivozn@redhat.com>

When hotplugging a chardev, Libvirt opens corresponding
file/binds to a socket/does whatever necessary to obtain an FD
that is later passed to QEMU. However, if something fails after
the FDs were transferred to QEMU and before chardev is actually
added via monitor, these FDs are never closed in QEMU. This is
rather suboptimal.

Fixes: 15bdced9b3d0b86a48506bfb1c27d6b2d5377dc2
Fixes: ad81aa8ad07e52c9bd4840de84d2ed59998b4d2a
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_hotplug.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 27e68370cf..fac893c80e 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2129,17 +2129,6 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver,
     if (qemuProcessPrepareHostBackendChardevHotplug(vm, dev) < 0)
         goto cleanup;
 
-    if (charpriv->sourcefd || charpriv->logfd || charpriv->directfd) {
-        qemuDomainObjEnterMonitor(driver, vm);
-
-        if (qemuFDPassTransferMonitor(charpriv->sourcefd, priv->mon) < 0 ||
-            qemuFDPassTransferMonitor(charpriv->logfd, priv->mon) < 0 ||
-            qemuFDPassDirectTransferMonitor(charpriv->directfd, priv->mon) < 0)
-            goto exit_monitor;
-
-        qemuDomainObjExitMonitor(vm);
-    }
-
     if (guestfwd) {
         if (!(netdevprops = qemuBuildChannelGuestfwdNetdevProps(chr)))
             goto cleanup;
@@ -2161,6 +2150,11 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver,
 
     qemuDomainObjEnterMonitor(driver, vm);
 
+    if (qemuFDPassTransferMonitor(charpriv->sourcefd, priv->mon) < 0 ||
+        qemuFDPassTransferMonitor(charpriv->logfd, priv->mon) < 0 ||
+        qemuFDPassDirectTransferMonitor(charpriv->directfd, priv->mon) < 0)
+        goto exit_monitor;
+
     if (qemuHotplugChardevAttach(priv->mon, charAlias, chr->source) < 0)
         goto exit_monitor;
     chardevAttached = true;
@@ -2206,6 +2200,7 @@ qemuDomainAttachChrDevice(virQEMUDriver *driver,
         qemuMonitorDetachCharDev(priv->mon, charAlias);
     qemuFDPassTransferMonitorRollback(charpriv->sourcefd, priv->mon);
     qemuFDPassTransferMonitorRollback(charpriv->logfd, priv->mon);
+    qemuFDPassDirectTransferMonitorRollback(charpriv->directfd, priv->mon);
     qemuDomainObjExitMonitor(vm);
     virErrorRestore(&orig_err);
 
-- 
2.35.1


From phrdina at redhat.com  Mon Jul 18 15:01:26 2022
From: phrdina at redhat.com (Pavel Hrdina)
Date: Mon, 18 Jul 2022 17:01:26 +0200
Subject: [PATCH 2/2] lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE
In-Reply-To: <91d5eff2c780f8bb96315047638e7b7aee1a40d5.1658152911.git.mprivozn@redhat.com>
References: <cover.1658152911.git.mprivozn@redhat.com>
 <91d5eff2c780f8bb96315047638e7b7aee1a40d5.1658152911.git.mprivozn@redhat.com>
Message-ID: <YtV1xqrhTgaGSMvy@antique-laptop>

On Mon, Jul 18, 2022 at 04:03:16PM +0200, Michal Privoznik wrote:
> The G_GNUC_NO_INLINE macro will eventually be marked as
> deprecated [1] and we are recommended to use G_NO_INLINE instead.
> Do the switch now, rather than waiting for compile time warning
> to occur.
> 
> 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  docs/coding-style.rst           |  2 +-
>  scripts/cocci-macro-file.h      |  2 +-
>  scripts/mock-noinline.py        |  4 ++--
>  src/cpu/cpu.h                   |  2 +-
>  src/libxl/libxl_capabilities.h  |  2 +-
>  src/qemu/qemu_capabilities.h    |  2 +-
>  src/qemu/qemu_capspriv.h        |  2 +-
>  src/qemu/qemu_command.h         |  4 ++--
>  src/qemu/qemu_hotplug.c         |  2 +-
>  src/qemu/qemu_hotplug.h         |  2 +-
>  src/qemu/qemu_interface.h       |  4 ++--
>  src/qemu/qemu_monitor.h         |  2 +-
>  src/qemu/qemu_monitor_json.h    |  2 +-
>  src/qemu/qemu_monitor_priv.h    |  2 +-
>  src/qemu/qemu_process.h         |  6 +++---
>  src/rpc/virnetsocket.h          |  4 ++--
>  src/util/glibcompat.h           | 28 ++++++++++++++++++++--------
>  src/util/vircgroupv2devices.h   |  2 +-
>  src/util/vircommand.h           |  2 +-
>  src/util/virdevmapper.h         |  2 +-
>  src/util/virfile.h              | 18 +++++++++---------
>  src/util/virhashcode.h          |  2 +-
>  src/util/virhostcpu.h           |  6 +++---
>  src/util/virhostmem.h           |  2 +-
>  src/util/virhostuptime.h        |  2 +-
>  src/util/viridentitypriv.h      |  2 +-
>  src/util/virmacaddr.h           |  2 +-
>  src/util/virnetdev.h            | 10 +++++-----
>  src/util/virnetdevbandwidth.h   |  2 +-
>  src/util/virnetdevip.h          |  2 +-
>  src/util/virnetdevmacvlan.h     |  2 +-
>  src/util/virnetdevopenvswitch.h |  2 +-
>  src/util/virnetdevtap.h         |  6 +++---
>  src/util/virnuma.h              | 18 +++++++++---------
>  src/util/virprocess.h           |  6 +++---
>  src/util/virrandom.h            |  6 +++---
>  src/util/virscsi.h              |  2 +-
>  src/util/virscsivhost.h         |  2 +-
>  src/util/virtpm.h               |  2 +-
>  src/util/virutil.h              | 16 ++++++++--------
>  src/util/viruuid.h              |  4 ++--
>  41 files changed, 102 insertions(+), 90 deletions(-)

[...]

> diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
> index e3a8b9f6b3..02f8ec090c 100644
> --- a/src/util/glibcompat.h
> +++ b/src/util/glibcompat.h
> @@ -95,11 +95,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args)
>  
>  void vir_g_source_unref(GSource *src, GMainContext *ctx);
>  
> -/* Intentionally redefine macro so that it's not marked as available in 2.58
> - * and newer. Drop when bumping to 2.58 or newer. */
> -#undef G_GNUC_NO_INLINE
> -#if g_macro__has_attribute(__noinline__)
> -# define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
> -#else
> -# define G_GNUC_NO_INLINE
> -#endif
> +#if !GLIB_CHECK_VERSION(2, 73, 0)

Not sure if this check is correct. Documentation for that macro
mentions that it is introduced in 2.74 but I can see it in 2.73.2 as
well but this check is for 2.73.0 and if I understand the
GLIB_CHECK_VERSION() correctly our own implementation would be used only
with glib older then 2.73.0.

That means based on my understanding that with glib 2.73.0 and 2.73.1
libvirt would failed to compile as there would not be any implementation
for G_NO_INLINE.

Pavel

> +# if (defined(__has_attribute) && __has_attribute(__noinline__)) || G_GNUC_CHECK_VERSION (2, 96)
> +#  if defined (__cplusplus) && __cplusplus >= 201103L
> +    /* Use ISO C++11 syntax when the compiler supports it. */
> +#   define G_NO_INLINE [[gnu::noinline]]
> +#  else
> +#   define G_NO_INLINE __attribute__ ((__noinline__))
> +#  endif
> +# elif defined (_MSC_VER) && (1200 <= _MSC_VER)
> +   /* Use MSVC specific syntax.  */
> +#  if defined (__cplusplus) && __cplusplus >= 201103L
> +    /* Use ISO C++11 syntax when the compiler supports it. */
> +#   define G_NO_INLINE [[msvc::noinline]]
> +#  else
> +#   define G_NO_INLINE __declspec (noinline)
> +#  endif
> +# else
> +#  define G_NO_INLINE /* empty */
> +# endif
> +#endif /* GLIB_CHECK_VERSION(2, 73, 0) */

[...]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220718/68285d47/attachment.sig>

From mprivozn at redhat.com  Mon Jul 18 15:11:22 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 18 Jul 2022 17:11:22 +0200
Subject: [PATCH 2/2] lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE
In-Reply-To: <YtV1xqrhTgaGSMvy@antique-laptop>
References: <cover.1658152911.git.mprivozn@redhat.com>
 <91d5eff2c780f8bb96315047638e7b7aee1a40d5.1658152911.git.mprivozn@redhat.com>
 <YtV1xqrhTgaGSMvy@antique-laptop>
Message-ID: <fdcad5c9-08b9-4d32-69f8-c825694a5a62@redhat.com>

On 7/18/22 17:01, Pavel Hrdina wrote:
> On Mon, Jul 18, 2022 at 04:03:16PM +0200, Michal Privoznik wrote:
>> The G_GNUC_NO_INLINE macro will eventually be marked as
>> deprecated [1] and we are recommended to use G_NO_INLINE instead.
>> Do the switch now, rather than waiting for compile time warning
>> to occur.
>>
>> 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6
>>
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
>>  docs/coding-style.rst           |  2 +-
>>  scripts/cocci-macro-file.h      |  2 +-
>>  scripts/mock-noinline.py        |  4 ++--
>>  src/cpu/cpu.h                   |  2 +-
>>  src/libxl/libxl_capabilities.h  |  2 +-
>>  src/qemu/qemu_capabilities.h    |  2 +-
>>  src/qemu/qemu_capspriv.h        |  2 +-
>>  src/qemu/qemu_command.h         |  4 ++--
>>  src/qemu/qemu_hotplug.c         |  2 +-
>>  src/qemu/qemu_hotplug.h         |  2 +-
>>  src/qemu/qemu_interface.h       |  4 ++--
>>  src/qemu/qemu_monitor.h         |  2 +-
>>  src/qemu/qemu_monitor_json.h    |  2 +-
>>  src/qemu/qemu_monitor_priv.h    |  2 +-
>>  src/qemu/qemu_process.h         |  6 +++---
>>  src/rpc/virnetsocket.h          |  4 ++--
>>  src/util/glibcompat.h           | 28 ++++++++++++++++++++--------
>>  src/util/vircgroupv2devices.h   |  2 +-
>>  src/util/vircommand.h           |  2 +-
>>  src/util/virdevmapper.h         |  2 +-
>>  src/util/virfile.h              | 18 +++++++++---------
>>  src/util/virhashcode.h          |  2 +-
>>  src/util/virhostcpu.h           |  6 +++---
>>  src/util/virhostmem.h           |  2 +-
>>  src/util/virhostuptime.h        |  2 +-
>>  src/util/viridentitypriv.h      |  2 +-
>>  src/util/virmacaddr.h           |  2 +-
>>  src/util/virnetdev.h            | 10 +++++-----
>>  src/util/virnetdevbandwidth.h   |  2 +-
>>  src/util/virnetdevip.h          |  2 +-
>>  src/util/virnetdevmacvlan.h     |  2 +-
>>  src/util/virnetdevopenvswitch.h |  2 +-
>>  src/util/virnetdevtap.h         |  6 +++---
>>  src/util/virnuma.h              | 18 +++++++++---------
>>  src/util/virprocess.h           |  6 +++---
>>  src/util/virrandom.h            |  6 +++---
>>  src/util/virscsi.h              |  2 +-
>>  src/util/virscsivhost.h         |  2 +-
>>  src/util/virtpm.h               |  2 +-
>>  src/util/virutil.h              | 16 ++++++++--------
>>  src/util/viruuid.h              |  4 ++--
>>  41 files changed, 102 insertions(+), 90 deletions(-)
> 
> [...]
> 
>> diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
>> index e3a8b9f6b3..02f8ec090c 100644
>> --- a/src/util/glibcompat.h
>> +++ b/src/util/glibcompat.h
>> @@ -95,11 +95,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args)
>>  
>>  void vir_g_source_unref(GSource *src, GMainContext *ctx);
>>  
>> -/* Intentionally redefine macro so that it's not marked as available in 2.58
>> - * and newer. Drop when bumping to 2.58 or newer. */
>> -#undef G_GNUC_NO_INLINE
>> -#if g_macro__has_attribute(__noinline__)
>> -# define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
>> -#else
>> -# define G_GNUC_NO_INLINE
>> -#endif
>> +#if !GLIB_CHECK_VERSION(2, 73, 0)
> 
> Not sure if this check is correct. Documentation for that macro
> mentions that it is introduced in 2.74 but I can see it in 2.73.2 as
> well but this check is for 2.73.0 and if I understand the
> GLIB_CHECK_VERSION() correctly our own implementation would be used only
> with glib older then 2.73.0.
> 
> That means based on my understanding that with glib 2.73.0 and 2.73.1
> libvirt would failed to compile as there would not be any implementation
> for G_NO_INLINE.

Yeah, so let's go with:

#if !GLIB_CHECK_VERSION(2, 73, 2)

Fixed locally.

Michal


From jdenemar at redhat.com  Mon Jul 18 15:15:29 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Mon, 18 Jul 2022 17:15:29 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
Message-ID: <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>

On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark <jdenemar at redhat.com> wrote:
> > Which in ideal case would mean only a QMP command (such as
> > hotplugging a non-migratable device) is the only way to add migration
> > blocker. If this is true, than we're safe as libvirt does not allow such
> > commands between qemuMigrationSrcIsAllowed and migration start.
> >
> 
> Ok, that rules out a few bad use cases. I can do a fast lookup to
> check if blockers can be added without the knowledge of libvirt.
> 
> > That said, is there a reason for not implementing the correct solution
> > right away as a separate patch?
> >
> 
> I was not sure if libvirt already had another way to check, for
> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.

I'm not aware of such check, but even if it exists, checking for
migration blockers looks like the right way of doing things anyway.

Jirka

From phrdina at redhat.com  Mon Jul 18 15:20:25 2022
From: phrdina at redhat.com (Pavel Hrdina)
Date: Mon, 18 Jul 2022 17:20:25 +0200
Subject: [PATCH 2/2] lib: Use G_NO_INLINE instead of G_GNUC_NO_INLINE
In-Reply-To: <fdcad5c9-08b9-4d32-69f8-c825694a5a62@redhat.com>
References: <cover.1658152911.git.mprivozn@redhat.com>
 <91d5eff2c780f8bb96315047638e7b7aee1a40d5.1658152911.git.mprivozn@redhat.com>
 <YtV1xqrhTgaGSMvy@antique-laptop>
 <fdcad5c9-08b9-4d32-69f8-c825694a5a62@redhat.com>
Message-ID: <YtV6OWwVXc4ETIca@antique-laptop>

On Mon, Jul 18, 2022 at 05:11:22PM +0200, Michal Pr?vozn?k wrote:
> On 7/18/22 17:01, Pavel Hrdina wrote:
> > On Mon, Jul 18, 2022 at 04:03:16PM +0200, Michal Privoznik wrote:
> >> The G_GNUC_NO_INLINE macro will eventually be marked as
> >> deprecated [1] and we are recommended to use G_NO_INLINE instead.
> >> Do the switch now, rather than waiting for compile time warning
> >> to occur.
> >>
> >> 1: https://gitlab.gnome.org/GNOME/glib/-/commit/15cd0f04612c90292792c4d123ebe84bf4bf93a6
> >>
> >> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> >> ---
> >>  docs/coding-style.rst           |  2 +-
> >>  scripts/cocci-macro-file.h      |  2 +-
> >>  scripts/mock-noinline.py        |  4 ++--
> >>  src/cpu/cpu.h                   |  2 +-
> >>  src/libxl/libxl_capabilities.h  |  2 +-
> >>  src/qemu/qemu_capabilities.h    |  2 +-
> >>  src/qemu/qemu_capspriv.h        |  2 +-
> >>  src/qemu/qemu_command.h         |  4 ++--
> >>  src/qemu/qemu_hotplug.c         |  2 +-
> >>  src/qemu/qemu_hotplug.h         |  2 +-
> >>  src/qemu/qemu_interface.h       |  4 ++--
> >>  src/qemu/qemu_monitor.h         |  2 +-
> >>  src/qemu/qemu_monitor_json.h    |  2 +-
> >>  src/qemu/qemu_monitor_priv.h    |  2 +-
> >>  src/qemu/qemu_process.h         |  6 +++---
> >>  src/rpc/virnetsocket.h          |  4 ++--
> >>  src/util/glibcompat.h           | 28 ++++++++++++++++++++--------
> >>  src/util/vircgroupv2devices.h   |  2 +-
> >>  src/util/vircommand.h           |  2 +-
> >>  src/util/virdevmapper.h         |  2 +-
> >>  src/util/virfile.h              | 18 +++++++++---------
> >>  src/util/virhashcode.h          |  2 +-
> >>  src/util/virhostcpu.h           |  6 +++---
> >>  src/util/virhostmem.h           |  2 +-
> >>  src/util/virhostuptime.h        |  2 +-
> >>  src/util/viridentitypriv.h      |  2 +-
> >>  src/util/virmacaddr.h           |  2 +-
> >>  src/util/virnetdev.h            | 10 +++++-----
> >>  src/util/virnetdevbandwidth.h   |  2 +-
> >>  src/util/virnetdevip.h          |  2 +-
> >>  src/util/virnetdevmacvlan.h     |  2 +-
> >>  src/util/virnetdevopenvswitch.h |  2 +-
> >>  src/util/virnetdevtap.h         |  6 +++---
> >>  src/util/virnuma.h              | 18 +++++++++---------
> >>  src/util/virprocess.h           |  6 +++---
> >>  src/util/virrandom.h            |  6 +++---
> >>  src/util/virscsi.h              |  2 +-
> >>  src/util/virscsivhost.h         |  2 +-
> >>  src/util/virtpm.h               |  2 +-
> >>  src/util/virutil.h              | 16 ++++++++--------
> >>  src/util/viruuid.h              |  4 ++--
> >>  41 files changed, 102 insertions(+), 90 deletions(-)
> > 
> > [...]
> > 
> >> diff --git a/src/util/glibcompat.h b/src/util/glibcompat.h
> >> index e3a8b9f6b3..02f8ec090c 100644
> >> --- a/src/util/glibcompat.h
> >> +++ b/src/util/glibcompat.h
> >> @@ -95,11 +95,23 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args)
> >>  
> >>  void vir_g_source_unref(GSource *src, GMainContext *ctx);
> >>  
> >> -/* Intentionally redefine macro so that it's not marked as available in 2.58
> >> - * and newer. Drop when bumping to 2.58 or newer. */
> >> -#undef G_GNUC_NO_INLINE
> >> -#if g_macro__has_attribute(__noinline__)
> >> -# define G_GNUC_NO_INLINE __attribute__ ((__noinline__))
> >> -#else
> >> -# define G_GNUC_NO_INLINE
> >> -#endif
> >> +#if !GLIB_CHECK_VERSION(2, 73, 0)
> > 
> > Not sure if this check is correct. Documentation for that macro
> > mentions that it is introduced in 2.74 but I can see it in 2.73.2 as
> > well but this check is for 2.73.0 and if I understand the
> > GLIB_CHECK_VERSION() correctly our own implementation would be used only
> > with glib older then 2.73.0.
> > 
> > That means based on my understanding that with glib 2.73.0 and 2.73.1
> > libvirt would failed to compile as there would not be any implementation
> > for G_NO_INLINE.
> 
> Yeah, so let's go with:
> 
> #if !GLIB_CHECK_VERSION(2, 73, 2)
> 
> Fixed locally.
> 
> Michal

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220718/a44653c4/attachment.sig>

From lin.a.yang at intel.com  Mon Jul 18 22:08:09 2022
From: lin.a.yang at intel.com (Yang, Lin A)
Date: Mon, 18 Jul 2022 22:08:09 +0000
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <MN0PR11MB59879BB086F4118B6169100FD48C9@MN0PR11MB5987.namprd11.prod.outlook.com>

Any comments/suggestions would be highly appreciated!

Basically, this V13 patch will detect whether QEMU provides SGX NUMA info.
If yes, it means QEMU version is above 7.0.0 and .node attribute is required
in QEMU command line. Otherwise, it assumes the QEMU version is 6.2.0.

Thanks,
Lin.
________________________________
From: Yang, Lin A <lin.a.yang at intel.com>
Sent: Friday, July 1, 2022 12:14
To: libvir-list at redhat.com <libvir-list at redhat.com>; Huang, Haibin <haibin.huang at intel.com>; Ding, Jian-feng <jian-feng.ding at intel.com>; Yang, Lin A <lin.a.yang at intel.com>
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX

This patch series provides support for enabling Intel's Software Guard
Extensions (SGX) feature in guest VM.

Giving the SGX support in QEMU had been merged. Intel SGX is a set of
instructions that increases the security of application code and data,
giving them more protection from disclosure or modification.
Developers can partition sensitive information into enclaves, which
are areas of execution in memory with more security protection.

The typical flow looks below at very high level:

1. Calls virConnectGetDomainCapabilities API to domain capabilities
that includes the following SGX information.

<feature>
  ...
  <sgx supported='yes'>
    <flc>no</flc>
    <sgx1>yes</sgx1>
    <sgx2>no</sgx2>
    <section_size>2</section_size>
    <sections>
      <section node='0' size='1'/>
      <section node='1' size='1'/>
    </sections>
  </sgx>
  ...
</feature>

2. User requests to start a guest calling virCreateXML() with SGX
requirement. It supports both non-NUMA SGX interface in QEMU 6.2.0
and NUMA SGX interface in QEMU 7.0.0 and later version.

Without NUMA info:
<devices>
  ...
  <memory model='sgx-epc'>
    <target>
      <size unit='KiB'>N</size>
    </target>
  </memory>
  ...
</devices>

With NUMA info:
<devices>
  ...
  <memory model='sgx-epc'>
    <source>
      <nodemask>0-1</nodemask>
    </source>
    <target>
      <size unit='KiB'>16384</size>
      <node>0</node>
    </target>
  </memory>
  ...
</devices>

Please note that it assumes EPC target node in guest VM (.node
attribute) is not required in SGX related parameter in QEMU command
if QEMU didn't provide any SGX NUMA info, like QEMU 6.2.0 version.

Haibin Huang (4):
  Define SGX capabilities structs
  Get SGX capabilities form QMP
  Convert QMP capabilities to domain capabilities
  conf: expose SGX feature in domain capabilities

Lin Yang (2):
  conf: Introduce SGX EPC element into device memory xml
  qemu: Add command-line to generate SGX EPC memory backend

 docs/formatdomain.rst                         |  27 +-
 docs/formatdomaincaps.rst                     |  40 +++
 src/conf/domain_capabilities.c                |  58 ++++
 src/conf/domain_capabilities.h                |  24 ++
 src/conf/domain_conf.c                        |  27 ++
 src/conf/domain_conf.h                        |   1 +
 src/conf/domain_validate.c                    |   9 +
 src/conf/schemas/domaincaps.rng               |  42 +++
 src/conf/schemas/domaincommon.rng             |   1 +
 src/libvirt_private.syms                      |   1 +
 src/qemu/qemu_alias.c                         |   6 +-
 src/qemu/qemu_capabilities.c                  | 258 ++++++++++++++++++
 src/qemu/qemu_capabilities.h                  |   4 +
 src/qemu/qemu_command.c                       |  87 +++++-
 src/qemu/qemu_domain.c                        |  48 +++-
 src/qemu/qemu_domain_address.c                |   6 +
 src/qemu/qemu_driver.c                        |   1 +
 src/qemu/qemu_monitor.c                       |  10 +
 src/qemu/qemu_monitor.h                       |   3 +
 src/qemu/qemu_monitor_json.c                  | 154 ++++++++++-
 src/qemu/qemu_monitor_json.h                  |   4 +
 src/qemu/qemu_process.c                       |   2 +
 src/qemu/qemu_validate.c                      |   8 +
 src/security/security_apparmor.c              |   1 +
 src/security/security_dac.c                   |   2 +
 src/security/security_selinux.c               |   2 +
 tests/domaincapsdata/bhyve_basic.x86_64.xml   |   1 +
 tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |   1 +
 tests/domaincapsdata/bhyve_uefi.x86_64.xml    |   1 +
 tests/domaincapsdata/empty.xml                |   1 +
 tests/domaincapsdata/libxl-xenfv.xml          |   1 +
 tests/domaincapsdata/libxl-xenpv.xml          |   1 +
 .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml |   1 +
 .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml |   1 +
 tests/domaincapsdata/qemu_2.11.0.s390x.xml    |   1 +
 tests/domaincapsdata/qemu_2.11.0.x86_64.xml   |   1 +
 .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml |   1 +
 .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml |   1 +
 .../qemu_2.12.0-virt.aarch64.xml              |   1 +
 tests/domaincapsdata/qemu_2.12.0.aarch64.xml  |   1 +
 tests/domaincapsdata/qemu_2.12.0.ppc64.xml    |   1 +
 tests/domaincapsdata/qemu_2.12.0.s390x.xml    |   1 +
 tests/domaincapsdata/qemu_2.12.0.x86_64.xml   |   1 +
 .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_3.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_3.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_3.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_4.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |   1 +
 .../qemu_4.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_4.2.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_5.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_5.1.0.sparc.xml     |   1 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |   1 +
 .../qemu_5.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_5.2.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_6.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_6.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |   6 +
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |   6 +
 .../qemu_6.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |   6 +
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |  10 +
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |  10 +
 .../qemu_7.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |  10 +
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |  10 +
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |  10 +
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |  10 +
 .../caps_6.2.0.x86_64.replies                 |  30 +-
 .../caps_6.2.0.x86_64.xml                     |   7 +
 .../caps_7.0.0.x86_64.replies                 |  34 ++-
 .../caps_7.0.0.x86_64.xml                     |  11 +
 .../caps_7.1.0.x86_64.replies                 |  34 ++-
 .../caps_7.1.0.x86_64.xml                     |  11 +
 .../sgx-epc-numa.x86_64-latest.args           |  40 +++
 tests/qemuxml2argvdata/sgx-epc-numa.xml       |  50 ++++
 .../sgx-epc.x86_64-6.2.0.args                 |  37 +++
 tests/qemuxml2argvdata/sgx-epc.xml            |  36 +++
 tests/qemuxml2argvtest.c                      |   3 +
 .../sgx-epc-numa.x86_64-latest.xml            |  64 +++++
 .../sgx-epc.x86_64-6.2.0.xml                  |  52 ++++
 tests/qemuxml2xmltest.c                       |   3 +
 124 files changed, 1349 insertions(+), 42 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml
 create mode 100644 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml

--
2.25.1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220718/6ecd5271/attachment-0001.htm>

From hhan at redhat.com  Tue Jul 19 07:02:20 2022
From: hhan at redhat.com (Han Han)
Date: Tue, 19 Jul 2022 15:02:20 +0800
Subject: [PATCH] schemas: Update ref acpi for devices
Message-ID: <20220719070220.1356681-1-hhan@redhat.com>

According to a9fe9569ab, the <acpi index='NNN'/> is only for PCI
devices. Remove the ref acpi from devices channel, smartcard, tpm,
redirdev, panic, hub because none of them has PCI address. And add the
ref acpi to iommu device.

Fixes: a9fe9569ab

Signed-off-by: Han Han <hhan at redhat.com>
---
 src/conf/schemas/domaincommon.rng | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index faa2561665..2f07c25430 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5409,9 +5409,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -5453,9 +5450,6 @@
           </interleave>
         </group>
       </choice>
-      <optional>
-        <ref name="alias"/>
-      </optional>
       <optional>
         <ref name="acpi"/>
       </optional>
@@ -5486,9 +5480,6 @@
       <optional>
         <ref name="alias"/>
       </optional>
-      <optional>
-        <ref name="acpi"/>
-      </optional>
       <optional>
         <ref name="address"/>
       </optional>
@@ -5661,6 +5652,9 @@
             </optional>
           </element>
         </optional>
+        <optional>
+          <ref name="acpi"/>
+        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -5772,9 +5766,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -5794,9 +5785,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
@@ -8048,9 +8036,6 @@
         <optional>
           <ref name="alias"/>
         </optional>
-        <optional>
-          <ref name="acpi"/>
-        </optional>
         <optional>
           <ref name="address"/>
         </optional>
-- 
2.37.1


From pkrempa at redhat.com  Tue Jul 19 10:45:22 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:22 +0200
Subject: [PATCH 0/7] Refactor closecallback use in LXC
Message-ID: <cover.1658227484.git.pkrempa@redhat.com>

The end-goal is to remove 'virCloseCallbacksGetConn'.

Peter Krempa (7):
  virLXCProcessStop: Add 'cleanupFlags' parameter
  virLXCProcessStart: Pass in virConnect object only when registering
    autodestroy
  virLXCProcessReboot: Simplify cleanup
  virLXCProcessAutostartAll: Remove unused 'conn'
  virLXCProcessAutostartDomain: Refactor control flow and variable use
  virLXCProcessReboot: Remove the need to re-register autodestroy
    callback
  virclosecallbacks: Remove unused virCloseCallbacksGetConn

 src/hypervisor/virclosecallbacks.c |  24 -----
 src/hypervisor/virclosecallbacks.h |   3 -
 src/libvirt_private.syms           |   1 -
 src/lxc/lxc_driver.c               |  17 ++--
 src/lxc/lxc_process.c              | 141 +++++++++++------------------
 src/lxc/lxc_process.h              |   8 +-
 6 files changed, 69 insertions(+), 125 deletions(-)

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:23 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:23 +0200
Subject: [PATCH 1/7] virLXCProcessStop: Add 'cleanupFlags' parameter
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <ffb590d2545ecace60eb7b2586e180b9e95107ae.1658227484.git.pkrempa@redhat.com>

Add possibility for the caller to set the flags for the call to
'virLXCProcessCleanup'.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_driver.c  |  2 +-
 src/lxc/lxc_process.c | 17 +++++++++--------
 src/lxc/lxc_process.h |  3 ++-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 0d8cdcebfd..456d2fbae9 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -1354,7 +1354,7 @@ lxcDomainDestroyFlags(virDomainPtr dom,
         goto endjob;

     priv = vm->privateData;
-    ret = virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED);
+    ret = virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, 0);
     event = virDomainEventLifecycleNewFromObj(vm,
                                      VIR_DOMAIN_EVENT_STOPPED,
                                      VIR_DOMAIN_EVENT_STOPPED_DESTROYED);
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 9dc7d9d0d8..587ba1d3c1 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -67,7 +67,7 @@ lxcProcessAutoDestroy(virDomainObj *dom,
     VIR_DEBUG("driver=%p dom=%s conn=%p", driver, dom->def->name, conn);

     VIR_DEBUG("Killing domain");
-    virLXCProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED);
+    virLXCProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED, 0);
     virDomainAuditStop(dom, "destroyed");
     event = virDomainEventLifecycleNewFromObj(dom,
                                      VIR_DOMAIN_EVENT_STOPPED,
@@ -108,7 +108,7 @@ virLXCProcessReboot(virLXCDriver *driver,
      * So temporarily hide the newDef and then reinstate it
      */
     savedDef = g_steal_pointer(&vm->newDef);
-    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
+    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
     vm->newDef = savedDef;
     if (virLXCProcessStart(conn, driver, vm,
                            0, NULL, autodestroy, reason) < 0) {
@@ -687,9 +687,9 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitor *mon,
     virObjectLock(vm);

     priv = vm->privateData;
-    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
+    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
     if (!priv->wantReboot) {
-        virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN);
+        virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
         if (!priv->doneStopEvent) {
             event = virDomainEventLifecycleNewFromObj(vm,
                                              VIR_DOMAIN_EVENT_STOPPED,
@@ -841,7 +841,8 @@ static virLXCMonitor *virLXCProcessConnectMonitor(virLXCDriver *driver,

 int virLXCProcessStop(virLXCDriver *driver,
                       virDomainObj *vm,
-                      virDomainShutoffReason reason)
+                      virDomainShutoffReason reason,
+                      unsigned int cleanupFlags)
 {
     int rc;
     virLXCDomainObjPrivate *priv;
@@ -899,7 +900,7 @@ int virLXCProcessStop(virLXCDriver *driver,
     }

  cleanup:
-    virLXCProcessCleanup(driver, vm, reason, 0);
+    virLXCProcessCleanup(driver, vm, reason, cleanupFlags);

     return 0;
 }
@@ -1535,7 +1536,7 @@ int virLXCProcessStart(virConnectPtr conn,
     if (rc != 0) {
         virErrorPreserveLast(&err);
         if (virDomainObjIsActive(vm)) {
-            virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
+            virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0);
         } else {
             /* virLXCProcessStop() is NOP if the container is not active.
              * If there was a failure whilst creating it, cleanup manually. */
@@ -1723,7 +1724,7 @@ virLXCProcessReconnectDomain(virDomainObj *vm,
     return ret;

  error:
-    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED);
+    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, 0);
     virDomainAuditStop(vm, "failed");
     goto cleanup;
 }
diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h
index 33ff334b74..1bce57809c 100644
--- a/src/lxc/lxc_process.h
+++ b/src/lxc/lxc_process.h
@@ -31,7 +31,8 @@ int virLXCProcessStart(virConnectPtr conn,
                        virDomainRunningReason reason);
 int virLXCProcessStop(virLXCDriver *driver,
                       virDomainObj *vm,
-                      virDomainShutoffReason reason);
+                      virDomainShutoffReason reason,
+                      unsigned int cleanupFlags);

 void virLXCProcessAutoDestroyRun(virLXCDriver *driver,
                                  virConnectPtr conn);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:24 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:24 +0200
Subject: [PATCH 2/7] virLXCProcessStart: Pass in virConnect object only when
 registering autodestroy
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <a035818c53d4464cbaebde05d2502508756ac932.1658227484.git.pkrempa@redhat.com>

The function doesn't really need the connect object for anything besides
registering the autodestroy callback for it. If we merge it certain
callers can be simplified.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_driver.c  | 15 +++++++++------
 src/lxc/lxc_process.c | 31 ++++++++++---------------------
 src/lxc/lxc_process.h |  5 ++---
 3 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 456d2fbae9..6b2f721178 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -964,9 +964,13 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
     virObjectEvent *event = NULL;
     int ret = -1;
     g_autoptr(virLXCDriverConfig) cfg = virLXCDriverGetConfig(driver);
+    virConnect *autoDestroyConn = NULL;

     virCheckFlags(VIR_DOMAIN_START_AUTODESTROY, -1);

+    if (flags & VIR_DOMAIN_START_AUTODESTROY)
+        autoDestroyConn = dom->conn;
+
     if (!(vm = lxcDomObjFromDomain(dom)))
         goto cleanup;

@@ -988,9 +992,7 @@ static int lxcDomainCreateWithFiles(virDomainPtr dom,
         goto endjob;
     }

-    ret = virLXCProcessStart(dom->conn, driver, vm,
-                             nfiles, files,
-                             (flags & VIR_DOMAIN_START_AUTODESTROY),
+    ret = virLXCProcessStart(driver, vm, nfiles, files, autoDestroyConn,
                              VIR_DOMAIN_RUNNING_BOOTED);

     if (ret == 0) {
@@ -1065,10 +1067,13 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
     g_autoptr(virLXCDriverConfig) cfg = virLXCDriverGetConfig(driver);
     g_autoptr(virCaps) caps = NULL;
     unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE;
+    virConnect *autoDestroyConn = NULL;

     virCheckFlags(VIR_DOMAIN_START_AUTODESTROY |
                   VIR_DOMAIN_START_VALIDATE, NULL);

+    if (flags & VIR_DOMAIN_START_AUTODESTROY)
+        autoDestroyConn = conn;

     if (flags & VIR_DOMAIN_START_VALIDATE)
         parse_flags |= VIR_DOMAIN_DEF_PARSE_VALIDATE_SCHEMA;
@@ -1106,9 +1111,7 @@ lxcDomainCreateXMLWithFiles(virConnectPtr conn,
         goto cleanup;
     }

-    if (virLXCProcessStart(conn, driver, vm,
-                           nfiles, files,
-                           (flags & VIR_DOMAIN_START_AUTODESTROY),
+    if (virLXCProcessStart(driver, vm, nfiles, files, autoDestroyConn,
                            VIR_DOMAIN_RUNNING_BOOTED) < 0) {
         virDomainAuditStart(vm, "booted", false);
         virLXCDomainObjEndJob(driver, vm);
diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 587ba1d3c1..4934a96e0c 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -87,21 +87,15 @@ static int
 virLXCProcessReboot(virLXCDriver *driver,
                     virDomainObj *vm)
 {
-    virConnectPtr conn = virCloseCallbacksGetConn(driver->closeCallbacks, vm);
+    g_autoptr(virConnect) autoDestroyConn = virCloseCallbacksGetConn(driver->closeCallbacks, vm);
     int reason = vm->state.reason;
-    bool autodestroy = false;
     int ret = -1;
     virDomainDef *savedDef;

     VIR_DEBUG("Faking reboot");

-    if (conn) {
-        virObjectRef(conn);
-        autodestroy = true;
-    } else {
-        conn = virConnectOpen("lxc:///system");
-        /* Ignoring NULL conn which is mostly harmless here */
-    }
+    if (autoDestroyConn)
+        virObjectRef(autoDestroyConn);

     /* In a reboot scenario, we need to make sure we continue
      * to use the current 'def', and not switch to 'newDef'.
@@ -110,8 +104,7 @@ virLXCProcessReboot(virLXCDriver *driver,
     savedDef = g_steal_pointer(&vm->newDef);
     virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
     vm->newDef = savedDef;
-    if (virLXCProcessStart(conn, driver, vm,
-                           0, NULL, autodestroy, reason) < 0) {
+    if (virLXCProcessStart(driver, vm, 0, NULL, autoDestroyConn, reason) < 0) {
         VIR_WARN("Unable to handle reboot of vm %s",
                  vm->def->name);
         goto cleanup;
@@ -120,7 +113,6 @@ virLXCProcessReboot(virLXCDriver *driver,
     ret = 0;

  cleanup:
-    virObjectUnref(conn);
     return ret;
 }

@@ -1146,21 +1138,19 @@ virLXCProcessEnsureRootFS(virDomainObj *vm)

 /**
  * virLXCProcessStart:
- * @conn: pointer to connection
  * @driver: pointer to driver structure
  * @vm: pointer to virtual machine structure
- * @autoDestroy: mark the domain for auto destruction
+ * @autoDestroyConn: mark the domain for auto destruction for the passed connection object
  * @reason: reason for switching vm to running state
  *
  * Starts a vm
  *
  * Returns 0 on success or -1 in case of error
  */
-int virLXCProcessStart(virConnectPtr conn,
-                       virLXCDriver * driver,
+int virLXCProcessStart(virLXCDriver * driver,
                        virDomainObj *vm,
                        unsigned int nfiles, int *files,
-                       bool autoDestroy,
+                       virConnectPtr autoDestroyConn,
                        virDomainRunningReason reason)
 {
     int rc = -1, r;
@@ -1505,9 +1495,9 @@ int virLXCProcessStart(virConnectPtr conn,
         goto cleanup;
     }

-    if (autoDestroy &&
+    if (autoDestroyConn &&
         virCloseCallbacksSet(driver->closeCallbacks, vm,
-                             conn, lxcProcessAutoDestroy) < 0)
+                             autoDestroyConn, lxcProcessAutoDestroy) < 0)
         goto cleanup;

     /* We don't need the temporary NIC names anymore, clear them */
@@ -1568,8 +1558,7 @@ virLXCProcessAutostartDomain(virDomainObj *vm,
     virObjectLock(vm);
     if (vm->autostart &&
         !virDomainObjIsActive(vm)) {
-        ret = virLXCProcessStart(data->conn, data->driver, vm,
-                                 0, NULL, false,
+        ret = virLXCProcessStart(data->driver, vm, 0, NULL, NULL,
                                  VIR_DOMAIN_RUNNING_BOOTED);
         virDomainAuditStart(vm, "booted", ret >= 0);
         if (ret < 0) {
diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h
index 1bce57809c..4b84e31fef 100644
--- a/src/lxc/lxc_process.h
+++ b/src/lxc/lxc_process.h
@@ -23,11 +23,10 @@

 #include "lxc_conf.h"

-int virLXCProcessStart(virConnectPtr conn,
-                       virLXCDriver * driver,
+int virLXCProcessStart(virLXCDriver * driver,
                        virDomainObj *vm,
                        unsigned int nfiles, int *files,
-                       bool autoDestroy,
+                       virConnectPtr autoDestroyConn,
                        virDomainRunningReason reason);
 int virLXCProcessStop(virLXCDriver *driver,
                       virDomainObj *vm,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:26 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:26 +0200
Subject: [PATCH 4/7] virLXCProcessAutostartAll: Remove unused 'conn'
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <66594ff4e7a11ccd55450778fc5a6784d3a8c66e.1658227484.git.pkrempa@redhat.com>

The connection object is not needed when autostarting containers so we
can remove the machinery for it.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_process.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 130c16aa04..a733f146f4 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1540,7 +1540,6 @@ int virLXCProcessStart(virLXCDriver * driver,

 struct virLXCProcessAutostartData {
     virLXCDriver *driver;
-    virConnectPtr conn;
 };

 static int
@@ -1576,21 +1575,11 @@ virLXCProcessAutostartDomain(virDomainObj *vm,
 void
 virLXCProcessAutostartAll(virLXCDriver *driver)
 {
-    /* XXX: Figure out a better way todo this. The domain
-     * startup code needs a connection handle in order
-     * to lookup the bridge associated with a virtual
-     * network
-     */
-    virConnectPtr conn = virConnectOpen("lxc:///system");
-    /* Ignoring NULL conn which is mostly harmless here */
-
-    struct virLXCProcessAutostartData data = { driver, conn };
+    struct virLXCProcessAutostartData data = { driver };

     virDomainObjListForEach(driver->domains, false,
                             virLXCProcessAutostartDomain,
                             &data);
-
-    virObjectUnref(conn);
 }


-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:27 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:27 +0200
Subject: [PATCH 5/7] virLXCProcessAutostartDomain: Refactor control flow and
 variable use
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <bfea243ab9e24e84b10ae05cbb427ff3215706d3.1658227484.git.pkrempa@redhat.com>

Use automatic unlocking of the 'vm' object, so that we can return early
when no autostart is needed and avoid passing of the 'driver' object
which is already present in 'vm's' private data.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_process.c | 55 ++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index a733f146f4..753e9e0b9a 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -1538,48 +1538,43 @@ int virLXCProcessStart(virLXCDriver * driver,
     return rc;
 }

-struct virLXCProcessAutostartData {
-    virLXCDriver *driver;
-};

 static int
 virLXCProcessAutostartDomain(virDomainObj *vm,
-                             void *opaque)
+                             void *opaque G_GNUC_UNUSED)
 {
-    const struct virLXCProcessAutostartData *data = opaque;
-    int ret = 0;
+    VIR_LOCK_GUARD lock = virObjectLockGuard(vm);
+    virLXCDomainObjPrivate *priv = vm->privateData;
+    virObjectEvent *event;
+    int rc = 0;

-    virObjectLock(vm);
-    if (vm->autostart &&
-        !virDomainObjIsActive(vm)) {
-        ret = virLXCProcessStart(data->driver, vm, 0, NULL, NULL,
-                                 VIR_DOMAIN_RUNNING_BOOTED);
-        virDomainAuditStart(vm, "booted", ret >= 0);
-        if (ret < 0) {
-            VIR_ERROR(_("Failed to autostart VM '%s': %s"),
-                      vm->def->name,
-                      virGetLastErrorMessage());
-        } else {
-            virObjectEvent *event =
-                virDomainEventLifecycleNewFromObj(vm,
-                                         VIR_DOMAIN_EVENT_STARTED,
-                                         VIR_DOMAIN_EVENT_STARTED_BOOTED);
-            virObjectEventStateQueue(data->driver->domainEventState, event);
-        }
+    if (!vm->autostart ||
+        virDomainObjIsActive(vm))
+        return 0;
+
+    rc = virLXCProcessStart(priv->driver, vm, 0, NULL, NULL, VIR_DOMAIN_RUNNING_BOOTED);
+    virDomainAuditStart(vm, "booted", rc >= 0);
+
+    if (rc < 0) {
+        VIR_ERROR(_("Failed to autostart VM '%s': %s"),
+                  vm->def->name,
+                  virGetLastErrorMessage());
+        return -1;
     }
-    virObjectUnlock(vm);
-    return ret;
+
+    event = virDomainEventLifecycleNewFromObj(vm,
+                                              VIR_DOMAIN_EVENT_STARTED,
+                                              VIR_DOMAIN_EVENT_STARTED_BOOTED);
+    virObjectEventStateQueue(priv->driver->domainEventState, event);
+
+    return 0;
 }


 void
 virLXCProcessAutostartAll(virLXCDriver *driver)
 {
-    struct virLXCProcessAutostartData data = { driver };
-
-    virDomainObjListForEach(driver->domains, false,
-                            virLXCProcessAutostartDomain,
-                            &data);
+    virDomainObjListForEach(driver->domains, false, virLXCProcessAutostartDomain, NULL);
 }


-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:29 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:29 +0200
Subject: [PATCH 7/7] virclosecallbacks: Remove unused virCloseCallbacksGetConn
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <2a7f7598e8ed4f3980f9312385b7afe6a0a13b32.1658227484.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/hypervisor/virclosecallbacks.c | 24 ------------------------
 src/hypervisor/virclosecallbacks.h |  3 ---
 src/libvirt_private.syms           |  1 -
 3 files changed, 28 deletions(-)

diff --git a/src/hypervisor/virclosecallbacks.c b/src/hypervisor/virclosecallbacks.c
index c533e695f1..a08464438a 100644
--- a/src/hypervisor/virclosecallbacks.c
+++ b/src/hypervisor/virclosecallbacks.c
@@ -195,30 +195,6 @@ virCloseCallbacksGet(virCloseCallbacks *closeCallbacks,
     return cb;
 }

-virConnectPtr
-virCloseCallbacksGetConn(virCloseCallbacks *closeCallbacks,
-                         virDomainObj *vm)
-{
-    char uuidstr[VIR_UUID_STRING_BUFLEN];
-    virDriverCloseDef *closeDef;
-    virConnectPtr conn = NULL;
-
-    virUUIDFormat(vm->def->uuid, uuidstr);
-    VIR_DEBUG("vm=%s, uuid=%s", vm->def->name, uuidstr);
-
-    virObjectLock(closeCallbacks);
-
-    closeDef = virHashLookup(closeCallbacks->list, uuidstr);
-    if (closeDef)
-        conn = closeDef->conn;
-
-    virObjectUnlock(closeCallbacks);
-
-    VIR_DEBUG("conn=%p", conn);
-    return conn;
-}
-
-
 typedef struct _virCloseCallbacksListEntry virCloseCallbacksListEntry;
 struct _virCloseCallbacksListEntry {
     unsigned char uuid[VIR_UUID_BUFLEN];
diff --git a/src/hypervisor/virclosecallbacks.h b/src/hypervisor/virclosecallbacks.h
index 5a56dea292..7afb0e5640 100644
--- a/src/hypervisor/virclosecallbacks.h
+++ b/src/hypervisor/virclosecallbacks.h
@@ -44,9 +44,6 @@ virCloseCallback
 virCloseCallbacksGet(virCloseCallbacks *closeCallbacks,
                      virDomainObj *vm,
                      virConnectPtr conn);
-virConnectPtr
-virCloseCallbacksGetConn(virCloseCallbacks *closeCallbacks,
-                         virDomainObj *vm);

 void
 virCloseCallbacksRun(virCloseCallbacks *closeCallbacks,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f4732f1742..1dd611e697 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1594,7 +1594,6 @@ virDomainJobTypeToString;

 # hypervisor/virclosecallbacks.h
 virCloseCallbacksGet;
-virCloseCallbacksGetConn;
 virCloseCallbacksNew;
 virCloseCallbacksRun;
 virCloseCallbacksSet;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:28 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:28 +0200
Subject: [PATCH 6/7] virLXCProcessReboot: Remove the need to re-register
 autodestroy callback
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <343e9af05e99c0eb1645b67d1360ba4135f096dd.1658227484.git.pkrempa@redhat.com>

Add a new flag VIR_LXC_PROCESS_CLEANUP_AUTODESTROY to
virLXCProcessCleanupFlags for skipping removal of the autodestroy
callback so that fake reboot of the container doesn't need to fetch the
connection and re-register it.

Since virLXCProcessReboot is defined before virLXCProcessCleanupFlags,
this patch also moves the flag enum typedef to the beginning of the
file.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_process.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 753e9e0b9a..f9854ac138 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -56,6 +56,13 @@ VIR_LOG_INIT("lxc.lxc_process");

 #define START_POSTFIX ": starting up\n"

+typedef enum {
+    VIR_LXC_PROCESS_CLEANUP_RELEASE_SECLABEL = (1 << 0),
+    VIR_LXC_PROCESS_CLEANUP_RESTORE_SECLABEL = (1 << 1),
+    VIR_LXC_PROCESS_CLEANUP_REMOVE_TRANSIENT = (1 << 2),
+    VIR_LXC_PROCESS_CLEANUP_AUTODESTROY = (1 << 3),
+} virLXCProcessCleanupFlags;
+
 static void
 lxcProcessAutoDestroy(virDomainObj *dom,
                       virConnectPtr conn)
@@ -87,23 +94,21 @@ static int
 virLXCProcessReboot(virLXCDriver *driver,
                     virDomainObj *vm)
 {
-    g_autoptr(virConnect) autoDestroyConn = virCloseCallbacksGetConn(driver->closeCallbacks, vm);
+    /* we want to keep the autodestroy callback registered */
+    unsigned int stopFlags = ~(VIR_LXC_PROCESS_CLEANUP_AUTODESTROY);
     int reason = vm->state.reason;
     virDomainDef *savedDef;

     VIR_DEBUG("Faking reboot");

-    if (autoDestroyConn)
-        virObjectRef(autoDestroyConn);
-
     /* In a reboot scenario, we need to make sure we continue
      * to use the current 'def', and not switch to 'newDef'.
      * So temporarily hide the newDef and then reinstate it
      */
     savedDef = g_steal_pointer(&vm->newDef);
-    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
+    virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, stopFlags);
     vm->newDef = savedDef;
-    if (virLXCProcessStart(driver, vm, 0, NULL, autoDestroyConn, reason) < 0) {
+    if (virLXCProcessStart(driver, vm, 0, NULL, NULL, reason) < 0) {
         VIR_WARN("Unable to handle reboot of vm %s", vm->def->name);
         return -1;
     }
@@ -126,12 +131,6 @@ lxcProcessRemoveDomainStatus(virLXCDriverConfig *cfg,
 }


-typedef enum {
-    VIR_LXC_PROCESS_CLEANUP_RELEASE_SECLABEL = (1 << 0),
-    VIR_LXC_PROCESS_CLEANUP_RESTORE_SECLABEL = (1 << 1),
-    VIR_LXC_PROCESS_CLEANUP_REMOVE_TRANSIENT = (1 << 2),
-} virLXCProcessCleanupFlags;
-
 /**
  * virLXCProcessCleanup:
  * @driver: pointer to driver structure
@@ -188,8 +187,9 @@ static void virLXCProcessCleanup(virLXCDriver *driver,
     }

     /* Stop autodestroy in case guest is restarted */
-    virCloseCallbacksUnset(driver->closeCallbacks, vm,
-                           lxcProcessAutoDestroy);
+    if (flags & VIR_LXC_PROCESS_CLEANUP_AUTODESTROY) {
+        virCloseCallbacksUnset(driver->closeCallbacks, vm, lxcProcessAutoDestroy);
+    }

     if (priv->monitor) {
         virLXCMonitorClose(priv->monitor);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 19 10:45:25 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 19 Jul 2022 12:45:25 +0200
Subject: [PATCH 3/7] virLXCProcessReboot: Simplify cleanup
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <501726510e8c2a5ca9c0a0b15a4e6c9c663808d5.1658227484.git.pkrempa@redhat.com>

Remove the pointless 'cleanup' section and 'ret' variable.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/lxc/lxc_process.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 4934a96e0c..130c16aa04 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -89,7 +89,6 @@ virLXCProcessReboot(virLXCDriver *driver,
 {
     g_autoptr(virConnect) autoDestroyConn = virCloseCallbacksGetConn(driver->closeCallbacks, vm);
     int reason = vm->state.reason;
-    int ret = -1;
     virDomainDef *savedDef;

     VIR_DEBUG("Faking reboot");
@@ -105,15 +104,11 @@ virLXCProcessReboot(virLXCDriver *driver,
     virLXCProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, 0);
     vm->newDef = savedDef;
     if (virLXCProcessStart(driver, vm, 0, NULL, autoDestroyConn, reason) < 0) {
-        VIR_WARN("Unable to handle reboot of vm %s",
-                 vm->def->name);
-        goto cleanup;
+        VIR_WARN("Unable to handle reboot of vm %s", vm->def->name);
+        return -1;
     }

-    ret = 0;
-
- cleanup:
-    return ret;
+    return 0;
 }


-- 
2.36.1


From jdenemar at redhat.com  Tue Jul 19 11:24:51 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Tue, 19 Jul 2022 13:24:51 +0200 (CEST)
Subject: Plans for the next release
Message-ID: <20220719112451.ACBA3241360@virval.usersys.redhat.com>

We are getting close to the next release of libvirt. To aim for the
release on Aug 01 I suggest entering the freeze on Tuesday Jul 26 and
tagging RC2 on Friday Jul 29.

I hope this works for everyone.

Jirka

From mprivozn at redhat.com  Tue Jul 19 12:04:53 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 19 Jul 2022 14:04:53 +0200
Subject: [PATCH 0/2] Two simple virBuffer*() usage fixes
Message-ID: <cover.1658232272.git.mprivozn@redhat.com>

*** BLURB HERE ***

Michal Pr?vozn?k (2):
  qemu_capabilities: Indent <cpudata/> properly
  domain_conf: Switch to virBufferAddLit for literal strings

 src/conf/domain_conf.c       | 4 ++--
 src/qemu/qemu_capabilities.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 19 12:04:54 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 19 Jul 2022 14:04:54 +0200
Subject: [PATCH 1/2] qemu_capabilities: Indent <cpudata/> properly
In-Reply-To: <cover.1658232272.git.mprivozn@redhat.com>
References: <cover.1658232272.git.mprivozn@redhat.com>
Message-ID: <e9e2acd0c9c2ab59787a3f7a03acef39096493bd.1658232272.git.mprivozn@redhat.com>

When formatting qemuCaps XML, the <cpudata/> element is
misaligned. This is because it contains multiple lines and
virBufferAsprintf() does not expect that. Switch to
virBufferAddStr() which does.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_capabilities.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index cf8f33475c..30b396d32d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -4756,7 +4756,7 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
 
     if (qemuCaps->cpuData) {
         g_autofree char * cpudata = virCPUDataFormat(qemuCaps->cpuData);
-        virBufferAsprintf(&buf, "%s", cpudata);
+        virBufferAddStr(&buf, cpudata);
     }
 
     virBufferAsprintf(&buf, "<arch>%s</arch>\n",
-- 
2.35.1


From mprivozn at redhat.com  Tue Jul 19 12:04:55 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Tue, 19 Jul 2022 14:04:55 +0200
Subject: [PATCH 2/2] domain_conf: Switch to virBufferAddLit for literal strings
In-Reply-To: <cover.1658232272.git.mprivozn@redhat.com>
References: <cover.1658232272.git.mprivozn@redhat.com>
Message-ID: <776b182eb3e4756fc17791e8219fc56fda1900d7.1658232272.git.mprivozn@redhat.com>

There's no need to use virBufferAddStr() for literal strings
without any newline character as it's more expensive than
virBufferAddLit().

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_conf.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4c7a5a044c..44a01ab628 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -25376,7 +25376,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
 
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
             if (flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE)
-                virBufferAddStr(buf, " autoport='no'");
+                virBufferAddLit(buf, " autoport='no'");
             break;
 
         case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET:
@@ -25388,7 +25388,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
              * parsed as listen type "none". */
             if ((flags & VIR_DOMAIN_DEF_FORMAT_MIGRATABLE) &&
                 glisten->fromConfig) {
-                virBufferAddStr(buf, " autoport='yes'");
+                virBufferAddLit(buf, " autoport='yes'");
             }
             break;
 
-- 
2.35.1


From twiederh at redhat.com  Tue Jul 19 12:22:22 2022
From: twiederh at redhat.com (Tim Wiederhake)
Date: Tue, 19 Jul 2022 14:22:22 +0200
Subject: [PATCH 0/2] Two simple virBuffer*() usage fixes
In-Reply-To: <cover.1658232272.git.mprivozn@redhat.com>
References: <cover.1658232272.git.mprivozn@redhat.com>
Message-ID: <6d6e18ec9888969b8b8b76ed6c9c253901887416.camel@redhat.com>

On Tue, 2022-07-19 at 14:04 +0200, Michal Privoznik wrote:
> *** BLURB HERE ***
> 
> Michal Pr?vozn?k (2):
> ? qemu_capabilities: Indent <cpudata/> properly
> ? domain_conf: Switch to virBufferAddLit for literal strings
> 
> ?src/conf/domain_conf.c?????? | 4 ++--
> ?src/qemu/qemu_capabilities.c | 2 +-
> ?2 files changed, 3 insertions(+), 3 deletions(-)
> 

Reviewed-by: Tim Wiederhake <twiederh at redhat.com>


From twiederh at redhat.com  Tue Jul 19 12:40:35 2022
From: twiederh at redhat.com (Tim Wiederhake)
Date: Tue, 19 Jul 2022 14:40:35 +0200
Subject: [PATCH 0/7] Refactor closecallback use in LXC
In-Reply-To: <cover.1658227484.git.pkrempa@redhat.com>
References: <cover.1658227484.git.pkrempa@redhat.com>
Message-ID: <2765b8b336cbf0ec96313f2a4ce14864944240f9.camel@redhat.com>

On Tue, 2022-07-19 at 12:45 +0200, Peter Krempa wrote:
> The end-goal is to remove 'virCloseCallbacksGetConn'.
> 
> Peter Krempa (7):
> ? virLXCProcessStop: Add 'cleanupFlags' parameter
> ? virLXCProcessStart: Pass in virConnect object only when registering
> ??? autodestroy
> ? virLXCProcessReboot: Simplify cleanup
> ? virLXCProcessAutostartAll: Remove unused 'conn'
> ? virLXCProcessAutostartDomain: Refactor control flow and variable
> use
> ? virLXCProcessReboot: Remove the need to re-register autodestroy
> ??? callback
> ? virclosecallbacks: Remove unused virCloseCallbacksGetConn
> 
> ?src/hypervisor/virclosecallbacks.c |? 24 -----
> ?src/hypervisor/virclosecallbacks.h |?? 3 -
> ?src/libvirt_private.syms?????????? |?? 1 -
> ?src/lxc/lxc_driver.c?????????????? |? 17 ++--
> ?src/lxc/lxc_process.c????????????? | 141 +++++++++++----------------
> --
> ?src/lxc/lxc_process.h????????????? |?? 8 +-
> ?6 files changed, 69 insertions(+), 125 deletions(-)
> 
Reviewed-by: Tim Wiederhake <twiederh at redhat.com>


From khanicov at redhat.com  Tue Jul 19 12:47:28 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 14:47:28 +0200
Subject: [PATCH] qemu: domainjob: remove async variable from
 qemuDomainObjBeginJobInternal()
Message-ID: <04336084729f064571c4098d47f627ad5c3abc72.1658234676.git.khanicov@redhat.com>

This patch removes variable 'async', which is used only once, and
replaces it with direct comparison with an enum member.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/qemu/qemu_domainjob.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 1f6d976558..7c6b697959 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -875,7 +875,6 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver,
     unsigned long long now;
     unsigned long long then;
     bool nested = job == VIR_JOB_ASYNC_NESTED;
-    bool async = job == VIR_JOB_ASYNC;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     const char *blocker = NULL;
     const char *agentBlocker = NULL;
@@ -903,7 +902,8 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver,
     then = now + QEMU_JOB_WAIT_TIME;
 
  retry:
-    if ((!async && job != VIR_JOB_DESTROY) &&
+    if (job != VIR_JOB_ASYNC &&
+        job != VIR_JOB_DESTROY &&
         cfg->maxQueuedJobs &&
         priv->job.jobsQueued > cfg->maxQueuedJobs) {
         goto error;
-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 12:52:01 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 14:52:01 +0200
Subject: [PATCH] hypervisor: domain_job: add and edit description
Message-ID: <4ecd6362ca5a94dd2cde4550a2710862aa2fed3a.1658234972.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/hypervisor/domain_job.c | 2 ++
 src/hypervisor/domain_job.h | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c
index 5939d93e47..6a0fbd42b3 100644
--- a/src/hypervisor/domain_job.c
+++ b/src/hypervisor/domain_job.c
@@ -1,4 +1,6 @@
 /*
+ * domain_job.c: job functions shared between hypervisor drivers
+ *
  * Copyright (C) 2022 Red Hat, Inc.
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 30f950ec23..b12e0c8e17 100644
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -1,4 +1,6 @@
 /*
+ * domain_job.h: job functions shared between hypervisor drivers
+ *
  * Copyright (C) 2022 Red Hat, Inc.
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
@@ -122,7 +124,8 @@ struct _virDomainJobData {
     char *errmsg; /* optional error message for failed completed jobs */
 
     void *privateData; /* private data of hypervisors */
-    virDomainJobDataPrivateDataCallbacks *privateDataCb; /* callbacks of private data, hypervisor based */
+    virDomainJobDataPrivateDataCallbacks *privateDataCb; /* callbacks of private data,
+                                                            hypervisor based */
 };
 
 
-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 13:48:19 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 15:48:19 +0200
Subject: [PATCH 0/5] hypervisor: move job object into hypervisor
Message-ID: <cover.1658237781.git.khanicov@redhat.com>

This series moves generalized qemu job object into hypervisor/ and
replaces all other hypervisor-specific job objects.

Kristina Hanicova (5):
  qemu & hypervisor: move job object into hypervisor
  hypervisor: domain_job: rename members in
    virDomainObjPrivateJobCallbacks
  LXC: use virDomainJobObj
  libxl: use virDomainJobObj
  CH: use virDomainJobObj

 src/ch/ch_domain.c               |  4 +-
 src/ch/ch_domain.h               |  9 +----
 src/hypervisor/domain_job.h      | 62 ++++++++++++++++++++++++++++++
 src/libxl/libxl_domain.c         |  6 +--
 src/libxl/libxl_domain.h         | 11 +-----
 src/lxc/lxc_domain.c             |  4 +-
 src/lxc/lxc_domain.h             |  9 +----
 src/qemu/qemu_domain.c           | 10 ++---
 src/qemu/qemu_domain.h           |  2 +-
 src/qemu/qemu_domainjob.c        | 26 ++++++-------
 src/qemu/qemu_domainjob.h        | 66 +++-----------------------------
 src/qemu/qemu_migration.c        |  2 +-
 src/qemu/qemu_migration.h        |  2 +-
 src/qemu/qemu_migration_params.c |  2 +-
 src/qemu/qemu_process.c          | 12 +++---
 15 files changed, 106 insertions(+), 121 deletions(-)

-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 13:48:20 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 15:48:20 +0200
Subject: [PATCH 1/5] qemu & hypervisor: move job object into hypervisor
In-Reply-To: <cover.1658237781.git.khanicov@redhat.com>
References: <cover.1658237781.git.khanicov@redhat.com>
Message-ID: <a6d00976612561ce5730de498c814e2201d1bcee.1658237781.git.khanicov@redhat.com>

This patch moves qemuDomainJobObj into hypervisor/ as generalized
virDomainJobObj along with generalized private job callbacks as
virDomainObjPrivateJobCallbacks.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/hypervisor/domain_job.h      | 62 ++++++++++++++++++++++++++++++
 src/qemu/qemu_domain.c           |  6 +--
 src/qemu/qemu_domain.h           |  2 +-
 src/qemu/qemu_domainjob.c        | 22 +++++------
 src/qemu/qemu_domainjob.h        | 66 +++-----------------------------
 src/qemu/qemu_migration.c        |  2 +-
 src/qemu/qemu_migration.h        |  2 +-
 src/qemu/qemu_migration_params.c |  2 +-
 src/qemu/qemu_process.c          | 12 +++---
 9 files changed, 91 insertions(+), 85 deletions(-)

diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 30f950ec23..c56c22e63c 100644
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -7,6 +7,9 @@
 
 #include "internal.h"
 #include "virenum.h"
+#include "virthread.h"
+#include "virbuffer.h"
+#include "domain_conf.h"
 
 #define JOB_MASK(job)                  (job == 0 ? 0 : 1 << (job - 1))
 #define VIR_JOB_DEFAULT_MASK \
@@ -99,6 +102,7 @@ struct _virDomainJobDataPrivateDataCallbacks {
     virDomainJobDataPrivateDataFree freePrivateData;
 };
 
+
 typedef struct _virDomainJobData virDomainJobData;
 struct _virDomainJobData {
     virDomainJobType jobType;
@@ -139,3 +143,61 @@ virDomainJobDataCopy(virDomainJobData *data);
 
 virDomainJobType
 virDomainJobStatusToType(virDomainJobStatus status);
+
+
+typedef struct _virDomainObjPrivateJobCallbacks virDomainObjPrivateJobCallbacks;
+
+typedef struct _virDomainJobObj virDomainJobObj;
+struct _virDomainJobObj {
+    virCond cond;               /* Use to coordinate jobs */
+
+    int jobsQueued;
+
+    /* The following members are for VIR_JOB_* */
+    virDomainJob active;        /* currently running job */
+    unsigned long long owner;           /* Thread id which set current job */
+    char *ownerAPI;                     /* The API which owns the job */
+    unsigned long long started;         /* When the current job started */
+
+    /* The following members are for VIR_AGENT_JOB_* */
+    virDomainAgentJob agentActive;     /* Currently running agent job */
+    unsigned long long agentOwner;      /* Thread id which set current agent job */
+    char *agentOwnerAPI;                /* The API which owns the agent job */
+    unsigned long long agentStarted;    /* When the current agent job started */
+
+    /* The following members are for VIR_ASYNC_JOB_* */
+    virCond asyncCond;                  /* Use to coordinate with async jobs */
+    virDomainAsyncJob asyncJob;        /* Currently active async job */
+    unsigned long long asyncOwner;      /* Thread which set current async job */
+    char *asyncOwnerAPI;                /* The API which owns the async job */
+    unsigned long long asyncStarted;    /* When the current async job started */
+    int phase;                          /* Job phase (mainly for migrations) */
+    unsigned long long mask;            /* Jobs allowed during async job */
+    virDomainJobData *current;       /* async job progress data */
+    virDomainJobData *completed;     /* statistics data of a recently completed job */
+    bool abortJob;                      /* abort of the job requested */
+    char *error;                        /* job event completion error */
+    unsigned long apiFlags; /* flags passed to the API which started the async job */
+
+    void *privateData;                  /* job specific collection of data */
+    virDomainObjPrivateJobCallbacks *cb;
+};
+
+
+typedef void *(*virDomainObjPrivateJobAlloc)(void);
+typedef void (*virDomainObjPrivateJobFree)(void *);
+typedef void (*virDomainObjPrivateJobReset)(void *);
+typedef int (*virDomainObjPrivateJobFormat)(virBuffer *,
+                                            virDomainJobObj *,
+                                            virDomainObj *);
+typedef int (*virDomainObjPrivateJobParse)(xmlXPathContextPtr,
+                                           virDomainJobObj *,
+                                           virDomainObj *);
+
+struct _virDomainObjPrivateJobCallbacks {
+   virDomainObjPrivateJobAlloc allocJobPrivate;
+   virDomainObjPrivateJobFree freeJobPrivate;
+   virDomainObjPrivateJobReset resetJobPrivate;
+   virDomainObjPrivateJobFormat formatJob;
+   virDomainObjPrivateJobParse parseJob;
+};
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 94b2e3118c..a643dd03af 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -199,7 +199,7 @@ qemuDomainObjPrivateXMLFormatMigrateTempBitmap(virBuffer *buf,
 
 static int
 qemuDomainFormatJobPrivate(virBuffer *buf,
-                           qemuDomainJobObj *job,
+                           virDomainJobObj *job,
                            virDomainObj *vm)
 {
     qemuDomainJobPrivate *priv = job->privateData;
@@ -342,7 +342,7 @@ qemuDomainObjPrivateXMLParseMigrateTempBitmap(qemuDomainJobPrivate *jobPriv,
 
 static int
 qemuDomainParseJobPrivate(xmlXPathContextPtr ctxt,
-                          qemuDomainJobObj *job,
+                          virDomainJobObj *job,
                           virDomainObj *vm)
 {
     qemuDomainJobPrivate *priv = job->privateData;
@@ -360,7 +360,7 @@ qemuDomainParseJobPrivate(xmlXPathContextPtr ctxt,
 }
 
 
-static qemuDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks = {
+static virDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks = {
     .allocJobPrivate = qemuJobAllocPrivate,
     .freeJobPrivate = qemuJobFreePrivate,
     .resetJobPrivate = qemuJobResetPrivate,
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 499ad03f91..4680df1098 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -99,7 +99,7 @@ typedef struct _qemuDomainObjPrivate qemuDomainObjPrivate;
 struct _qemuDomainObjPrivate {
     virQEMUDriver *driver;
 
-    qemuDomainJobObj job;
+    virDomainJobObj job;
 
     virBitmap *namespaces;
 
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 1f6d976558..05480239b1 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -151,8 +151,8 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver,
 
 
 int
-qemuDomainObjInitJob(qemuDomainJobObj *job,
-                     qemuDomainObjPrivateJobCallbacks *cb)
+qemuDomainObjInitJob(virDomainJobObj *job,
+                     virDomainObjPrivateJobCallbacks *cb)
 {
     memset(job, 0, sizeof(*job));
     job->cb = cb;
@@ -177,7 +177,7 @@ qemuDomainObjInitJob(qemuDomainJobObj *job,
 
 
 static void
-qemuDomainObjResetJob(qemuDomainJobObj *job)
+qemuDomainObjResetJob(virDomainJobObj *job)
 {
     job->active = VIR_JOB_NONE;
     job->owner = 0;
@@ -187,7 +187,7 @@ qemuDomainObjResetJob(qemuDomainJobObj *job)
 
 
 static void
-qemuDomainObjResetAgentJob(qemuDomainJobObj *job)
+qemuDomainObjResetAgentJob(virDomainJobObj *job)
 {
     job->agentActive = VIR_AGENT_JOB_NONE;
     job->agentOwner = 0;
@@ -197,7 +197,7 @@ qemuDomainObjResetAgentJob(qemuDomainJobObj *job)
 
 
 static void
-qemuDomainObjResetAsyncJob(qemuDomainJobObj *job)
+qemuDomainObjResetAsyncJob(virDomainJobObj *job)
 {
     job->asyncJob = VIR_ASYNC_JOB_NONE;
     job->asyncOwner = 0;
@@ -226,7 +226,7 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObj *job)
  */
 int
 qemuDomainObjPreserveJob(virDomainObj *obj,
-                         qemuDomainJobObj *job)
+                         virDomainJobObj *job)
 {
     qemuDomainObjPrivate *priv = obj->privateData;
 
@@ -262,7 +262,7 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
                              unsigned long long allowedJobs)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    qemuDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
 
     VIR_DEBUG("Restoring %s async job for domain %s",
               virDomainAsyncJobTypeToString(asyncJob), vm->def->name);
@@ -287,7 +287,7 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
 
 
 void
-qemuDomainObjClearJob(qemuDomainJobObj *job)
+qemuDomainObjClearJob(virDomainJobObj *job)
 {
     qemuDomainObjResetJob(job);
     qemuDomainObjResetAsyncJob(job);
@@ -820,7 +820,7 @@ qemuDomainObjReleaseAsyncJob(virDomainObj *obj)
 }
 
 static bool
-qemuDomainNestedJobAllowed(qemuDomainJobObj *jobs, virDomainJob newJob)
+qemuDomainNestedJobAllowed(virDomainJobObj *jobs, virDomainJob newJob)
 {
     return !jobs->asyncJob ||
            newJob == VIR_JOB_NONE ||
@@ -828,7 +828,7 @@ qemuDomainNestedJobAllowed(qemuDomainJobObj *jobs, virDomainJob newJob)
 }
 
 static bool
-qemuDomainObjCanSetJob(qemuDomainJobObj *job,
+qemuDomainObjCanSetJob(virDomainJobObj *job,
                        virDomainJob newJob,
                        virDomainAgentJob newAgentJob)
 {
@@ -1308,7 +1308,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
                                 xmlXPathContextPtr ctxt)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    qemuDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
     VIR_XPATH_NODE_AUTORESTORE(ctxt)
     g_autofree char *tmp = NULL;
 
diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index e8021a7f04..b39b04edcb 100644
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -60,62 +60,6 @@ struct _qemuDomainJobDataPrivate {
 
 extern virDomainJobDataPrivateDataCallbacks qemuJobDataPrivateDataCallbacks;
 
-typedef struct _qemuDomainJobObj qemuDomainJobObj;
-
-typedef void *(*qemuDomainObjPrivateJobAlloc)(void);
-typedef void (*qemuDomainObjPrivateJobFree)(void *);
-typedef void (*qemuDomainObjPrivateJobReset)(void *);
-typedef int (*qemuDomainObjPrivateJobFormat)(virBuffer *,
-                                             qemuDomainJobObj *,
-                                             virDomainObj *);
-typedef int (*qemuDomainObjPrivateJobParse)(xmlXPathContextPtr,
-                                            qemuDomainJobObj *,
-                                            virDomainObj *);
-
-typedef struct _qemuDomainObjPrivateJobCallbacks qemuDomainObjPrivateJobCallbacks;
-struct _qemuDomainObjPrivateJobCallbacks {
-   qemuDomainObjPrivateJobAlloc allocJobPrivate;
-   qemuDomainObjPrivateJobFree freeJobPrivate;
-   qemuDomainObjPrivateJobReset resetJobPrivate;
-   qemuDomainObjPrivateJobFormat formatJob;
-   qemuDomainObjPrivateJobParse parseJob;
-};
-
-struct _qemuDomainJobObj {
-    virCond cond;                       /* Use to coordinate jobs */
-
-    int jobsQueued;
-
-    /* The following members are for VIR_JOB_* */
-    virDomainJob active;               /* Currently running job */
-    unsigned long long owner;           /* Thread id which set current job */
-    char *ownerAPI;                     /* The API which owns the job */
-    unsigned long long started;         /* When the current job started */
-
-    /* The following members are for VIR_AGENT_JOB_* */
-    virDomainAgentJob agentActive;     /* Currently running agent job */
-    unsigned long long agentOwner;      /* Thread id which set current agent job */
-    char *agentOwnerAPI;                /* The API which owns the agent job */
-    unsigned long long agentStarted;    /* When the current agent job started */
-
-    /* The following members are for VIR_ASYNC_JOB_* */
-    virCond asyncCond;                  /* Use to coordinate with async jobs */
-    virDomainAsyncJob asyncJob;        /* Currently active async job */
-    unsigned long long asyncOwner;      /* Thread which set current async job */
-    char *asyncOwnerAPI;                /* The API which owns the async job */
-    unsigned long long asyncStarted;    /* When the current async job started */
-    int phase;                          /* Job phase (mainly for migrations) */
-    unsigned long long mask;            /* Jobs allowed during async job */
-    virDomainJobData *current;       /* async job progress data */
-    virDomainJobData *completed;     /* statistics data of a recently completed job */
-    bool abortJob;                      /* abort of the job requested */
-    char *error;                        /* job event completion error */
-    unsigned long apiFlags; /* flags passed to the API which started the async job */
-
-    void *privateData;                  /* job specific collection of data */
-    qemuDomainObjPrivateJobCallbacks *cb;
-};
-
 void qemuDomainJobSetStatsType(virDomainJobData *jobData,
                                qemuDomainJobStatsType type);
 
@@ -162,7 +106,7 @@ qemuDomainObjStartJobPhase(virDomainObj *obj,
 void qemuDomainObjSetAsyncJobMask(virDomainObj *obj,
                                   unsigned long long allowedJobs);
 int qemuDomainObjPreserveJob(virDomainObj *obj,
-                             qemuDomainJobObj *job);
+                             virDomainJobObj *job);
 void
 qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
                              virDomainAsyncJob asyncJob,
@@ -191,12 +135,12 @@ int qemuDomainJobDataToParams(virDomainJobData *jobData,
 
 bool qemuDomainTrackJob(virDomainJob job);
 
-void qemuDomainObjClearJob(qemuDomainJobObj *job);
-G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(qemuDomainJobObj, qemuDomainObjClearJob);
+void qemuDomainObjClearJob(virDomainJobObj *job);
+G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, qemuDomainObjClearJob);
 
 int
-qemuDomainObjInitJob(qemuDomainJobObj *job,
-                     qemuDomainObjPrivateJobCallbacks *cb);
+qemuDomainObjInitJob(virDomainJobObj *job,
+                     virDomainObjPrivateJobCallbacks *cb);
 
 int
 qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b12cb518ee..b096e56824 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -6385,7 +6385,7 @@ qemuMigrationDstComplete(virQEMUDriver *driver,
                          virDomainObj *vm,
                          bool inPostCopy,
                          virDomainAsyncJob asyncJob,
-                         qemuDomainJobObj *job)
+                         virDomainJobObj *job)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     qemuDomainJobPrivate *jobPriv = job->privateData;
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 81cc1e91c0..65c29d5744 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -204,7 +204,7 @@ qemuMigrationDstComplete(virQEMUDriver *driver,
                          virDomainObj *vm,
                          bool inPostCopy,
                          virDomainAsyncJob asyncJob,
-                         qemuDomainJobObj *job);
+                         virDomainJobObj *job);
 
 int
 qemuMigrationSrcConfirm(virQEMUDriver *driver,
diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 0bce358ac3..1fd0c55905 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -1181,7 +1181,7 @@ qemuMigrationParamsGetULL(qemuMigrationParams *migParams,
  * qemuMigrationParamsCheck:
  *
  * Check supported migration parameters and keep their original values in
- * qemuDomainJobObj so that we can properly reset them at the end of migration.
+ * virDomainJobObj so that we can properly reset them at the end of migration.
  * Reports an error if any of the currently used capabilities in @migParams
  * are unsupported by QEMU.
  */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 486be9344a..d42333195a 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3457,7 +3457,7 @@ qemuProcessCleanupMigrationJob(virQEMUDriver *driver,
 
 static void
 qemuProcessRestoreMigrationJob(virDomainObj *vm,
-                               qemuDomainJobObj *job)
+                               virDomainJobObj *job)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     qemuDomainJobPrivate *jobPriv = job->privateData;
@@ -3496,7 +3496,7 @@ qemuProcessRestoreMigrationJob(virDomainObj *vm,
 static int
 qemuProcessRecoverMigrationIn(virQEMUDriver *driver,
                               virDomainObj *vm,
-                              qemuDomainJobObj *job,
+                              virDomainJobObj *job,
                               virDomainState state)
 {
     VIR_DEBUG("Active incoming migration in phase %s",
@@ -3567,7 +3567,7 @@ qemuProcessRecoverMigrationIn(virQEMUDriver *driver,
 static int
 qemuProcessRecoverMigrationOut(virQEMUDriver *driver,
                                virDomainObj *vm,
-                               qemuDomainJobObj *job,
+                               virDomainJobObj *job,
                                virDomainJobStatus migStatus,
                                virDomainState state,
                                int reason,
@@ -3673,7 +3673,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriver *driver,
 static int
 qemuProcessRecoverMigration(virQEMUDriver *driver,
                             virDomainObj *vm,
-                            qemuDomainJobObj *job,
+                            virDomainJobObj *job,
                             unsigned int *stopFlags)
 {
     virDomainJobStatus migStatus = VIR_DOMAIN_JOB_STATUS_NONE;
@@ -3735,7 +3735,7 @@ qemuProcessRecoverMigration(virQEMUDriver *driver,
 static int
 qemuProcessRecoverJob(virQEMUDriver *driver,
                       virDomainObj *vm,
-                      qemuDomainJobObj *job,
+                      virDomainJobObj *job,
                       unsigned int *stopFlags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
@@ -8866,7 +8866,7 @@ qemuProcessReconnect(void *opaque)
     virQEMUDriver *driver = data->driver;
     virDomainObj *obj = data->obj;
     qemuDomainObjPrivate *priv;
-    g_auto(qemuDomainJobObj) oldjob = {
+    g_auto(virDomainJobObj) oldjob = {
       .cb = NULL,
     };
     int state;
-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 13:48:21 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 15:48:21 +0200
Subject: [PATCH 2/5] hypervisor: domain_job: rename members in
 virDomainObjPrivateJobCallbacks
In-Reply-To: <cover.1658237781.git.khanicov@redhat.com>
References: <cover.1658237781.git.khanicov@redhat.com>
Message-ID: <fe273ec824c43640e9ccd92fe04ca12bc8914bb4.1658237781.git.khanicov@redhat.com>

This patch alters members of virDomainObjPrivateJobCallbacks to
make the code more consistent.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/hypervisor/domain_job.h | 4 ++--
 src/qemu/qemu_domain.c      | 4 ++--
 src/qemu/qemu_domainjob.c   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index c56c22e63c..7d9c715957 100644
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -198,6 +198,6 @@ struct _virDomainObjPrivateJobCallbacks {
    virDomainObjPrivateJobAlloc allocJobPrivate;
    virDomainObjPrivateJobFree freeJobPrivate;
    virDomainObjPrivateJobReset resetJobPrivate;
-   virDomainObjPrivateJobFormat formatJob;
-   virDomainObjPrivateJobParse parseJob;
+   virDomainObjPrivateJobFormat formatJobPrivate;
+   virDomainObjPrivateJobParse parseJobPrivate;
 };
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index a643dd03af..2d7f6d761d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -364,8 +364,8 @@ static virDomainObjPrivateJobCallbacks qemuPrivateJobCallbacks = {
     .allocJobPrivate = qemuJobAllocPrivate,
     .freeJobPrivate = qemuJobFreePrivate,
     .resetJobPrivate = qemuJobResetPrivate,
-    .formatJob = qemuDomainFormatJobPrivate,
-    .parseJob = qemuDomainParseJobPrivate,
+    .formatJobPrivate = qemuDomainFormatJobPrivate,
+    .parseJobPrivate = qemuDomainParseJobPrivate,
 };
 
 /**
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 05480239b1..b4082a12e3 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -1294,7 +1294,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
     }
 
     if (priv->job.cb &&
-        priv->job.cb->formatJob(&childBuf, &priv->job, vm) < 0)
+        priv->job.cb->formatJobPrivate(&childBuf, &priv->job, vm) < 0)
         return -1;
 
     virXMLFormatElement(buf, "job", &attrBuf, &childBuf);
@@ -1362,7 +1362,7 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
     }
 
     if (priv->job.cb &&
-        priv->job.cb->parseJob(ctxt, job, vm) < 0)
+        priv->job.cb->parseJobPrivate(ctxt, job, vm) < 0)
         return -1;
 
     return 0;
-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 13:48:22 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 15:48:22 +0200
Subject: [PATCH 3/5] LXC: use virDomainJobObj
In-Reply-To: <cover.1658237781.git.khanicov@redhat.com>
References: <cover.1658237781.git.khanicov@redhat.com>
Message-ID: <a2dcc55520c21ee2fee8f1ccc834bc8ba03e6770.1658237781.git.khanicov@redhat.com>

This patch replaces struct virLXCDomainJobObj with generalized
virDomainJobObj.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/lxc/lxc_domain.c | 4 ++--
 src/lxc/lxc_domain.h | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 4c7265e40c..16b667de95 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -49,7 +49,7 @@ virLXCDomainObjInitJob(virLXCDomainObjPrivate *priv)
 static void
 virLXCDomainObjResetJob(virLXCDomainObjPrivate *priv)
 {
-    struct virLXCDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
 
     job->active = VIR_JOB_NONE;
     job->owner = 0;
@@ -103,7 +103,7 @@ virLXCDomainObjBeginJob(virLXCDriver *driver G_GNUC_UNUSED,
 
  error:
     VIR_WARN("Cannot start job (%s) for domain %s;"
-             " current job is (%s) owned by (%d)",
+             " current job is (%s) owned by (%llu)",
              virDomainJobTypeToString(job),
              obj->def->name,
              virDomainJobTypeToString(priv->job.active),
diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h
index d91dcca04b..82c36eb940 100644
--- a/src/lxc/lxc_domain.h
+++ b/src/lxc/lxc_domain.h
@@ -54,13 +54,6 @@ struct _lxcDomainDef {
 };
 
 
-struct virLXCDomainJobObj {
-    virCond cond;                       /* Use to coordinate jobs */
-    virDomainJob active;                /* Currently running job */
-    int owner;                          /* Thread which set current job */
-};
-
-
 typedef struct _virLXCDomainObjPrivate virLXCDomainObjPrivate;
 struct _virLXCDomainObjPrivate {
     virLXCDriver *driver;
@@ -74,7 +67,7 @@ struct _virLXCDomainObjPrivate {
     virCgroup *cgroup;
     char *machineName;
 
-    struct virLXCDomainJobObj job;
+    virDomainJobObj job;
 };
 
 extern virXMLNamespace virLXCDriverDomainXMLNamespace;
-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 13:48:23 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 15:48:23 +0200
Subject: [PATCH 4/5] libxl: use virDomainJobObj
In-Reply-To: <cover.1658237781.git.khanicov@redhat.com>
References: <cover.1658237781.git.khanicov@redhat.com>
Message-ID: <10d899c7cbf7c22582096e9389fee3f69d0f1cea.1658237781.git.khanicov@redhat.com>

This patch replaces struct libxlDomainJobObj with generalized
virDomainJobObj.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/libxl/libxl_domain.c |  6 +++---
 src/libxl/libxl_domain.h | 11 ++---------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index 49577d6328..ce515ec54e 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -60,7 +60,7 @@ libxlDomainObjInitJob(libxlDomainObjPrivate *priv)
 static void
 libxlDomainObjResetJob(libxlDomainObjPrivate *priv)
 {
-    struct libxlDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
 
     job->active = VIR_JOB_NONE;
     job->owner = 0;
@@ -117,7 +117,7 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED,
 
  error:
     VIR_WARN("Cannot start job (%s) for domain %s;"
-             " current job is (%s) owned by (%d)",
+             " current job is (%s) owned by (%llu)",
              virDomainJobTypeToString(job),
              obj->def->name,
              virDomainJobTypeToString(priv->job.active),
@@ -158,7 +158,7 @@ libxlDomainObjEndJob(libxlDriverPrivate *driver G_GNUC_UNUSED,
 }
 
 int
-libxlDomainJobUpdateTime(struct libxlDomainJobObj *job)
+libxlDomainJobUpdateTime(virDomainJobObj *job)
 {
     virDomainJobData *jobData = job->current;
     unsigned long long now;
diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h
index 5ce4d518a9..5843a4921f 100644
--- a/src/libxl/libxl_domain.h
+++ b/src/libxl/libxl_domain.h
@@ -27,13 +27,6 @@
 #include "domain_job.h"
 
 
-struct libxlDomainJobObj {
-    virCond cond;                       /* Use to coordinate jobs */
-    virDomainJob active;                /* Currently running job */
-    int owner;                          /* Thread which set current job */
-    virDomainJobData *current;        /* Statistics for the current job */
-};
-
 typedef struct _libxlDomainObjPrivate libxlDomainObjPrivate;
 struct _libxlDomainObjPrivate {
     /* console */
@@ -44,7 +37,7 @@ struct _libxlDomainObjPrivate {
     char *lockState;
     bool lockProcessRunning;
 
-    struct libxlDomainJobObj job;
+    virDomainJobObj job;
 
     bool hookRun;  /* true if there was a hook run over this domain */
 };
@@ -69,7 +62,7 @@ libxlDomainObjEndJob(libxlDriverPrivate *driver,
                      virDomainObj *obj);
 
 int
-libxlDomainJobUpdateTime(struct libxlDomainJobObj *job)
+libxlDomainJobUpdateTime(virDomainJobObj *job)
     G_GNUC_WARN_UNUSED_RESULT;
 
 char *
-- 
2.35.3


From khanicov at redhat.com  Tue Jul 19 13:48:24 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Tue, 19 Jul 2022 15:48:24 +0200
Subject: [PATCH 5/5] CH: use virDomainJobObj
In-Reply-To: <cover.1658237781.git.khanicov@redhat.com>
References: <cover.1658237781.git.khanicov@redhat.com>
Message-ID: <29f9312fc3242eff98d618e6c709c4188f48371e.1658237781.git.khanicov@redhat.com>

This patch replaces struct virCHDomainJobObj with generalized
virDomainJobObj.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/ch/ch_domain.c | 4 ++--
 src/ch/ch_domain.h | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index 62a6f7a9d6..2afb3582b1 100644
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -46,7 +46,7 @@ virCHDomainObjInitJob(virCHDomainObjPrivate *priv)
 static void
 virCHDomainObjResetJob(virCHDomainObjPrivate *priv)
 {
-    struct virCHDomainJobObj *job = &priv->job;
+    virDomainJobObj *job = &priv->job;
 
     job->active = VIR_JOB_NONE;
     job->owner = 0;
@@ -83,7 +83,7 @@ virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job)
                   virDomainJobTypeToString(job));
         if (virCondWaitUntil(&priv->job.cond, &obj->parent.lock, then) < 0) {
             VIR_WARN("Cannot start job (%s) for domain %s;"
-                     " current job is (%s) owned by (%d)",
+                     " current job is (%s) owned by (%llu)",
                      virDomainJobTypeToString(job),
                      obj->def->name,
                      virDomainJobTypeToString(priv->job.active),
diff --git a/src/ch/ch_domain.h b/src/ch/ch_domain.h
index f75a08ec87..b3bebd6b9a 100644
--- a/src/ch/ch_domain.h
+++ b/src/ch/ch_domain.h
@@ -30,16 +30,9 @@
 #define CH_JOB_WAIT_TIME (1000ull * 30)
 
 
-struct virCHDomainJobObj {
-    virCond cond;                       /* Use to coordinate jobs */
-    virDomainJob active;                /* Currently running job */
-    int owner;                          /* Thread which set current job */
-};
-
-
 typedef struct _virCHDomainObjPrivate virCHDomainObjPrivate;
 struct _virCHDomainObjPrivate {
-    struct virCHDomainJobObj job;
+    virDomainJobObj job;
 
     virChrdevs *chrdevs;
     virCHDriver *driver;
-- 
2.35.3


From laine at laine.org  Tue Jul 19 13:35:53 2022
From: laine at laine.org (Laine Stump)
Date: Tue, 19 Jul 2022 09:35:53 -0400
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
Message-ID: <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>

On 7/18/22 11:15 AM, Jiri Denemark wrote:
> On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
>> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark <jdenemar at redhat.com> wrote:
>>> Which in ideal case would mean only a QMP command (such as
>>> hotplugging a non-migratable device) is the only way to add migration
>>> blocker. If this is true, than we're safe as libvirt does not allow such
>>> commands between qemuMigrationSrcIsAllowed and migration start.
>>>
>>
>> Ok, that rules out a few bad use cases. I can do a fast lookup to
>> check if blockers can be added without the knowledge of libvirt.
>>
>>> That said, is there a reason for not implementing the correct solution
>>> right away as a separate patch?
>>>
>>
>> I was not sure if libvirt already had another way to check, for
>> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.
> 
> I'm not aware of such check, but even if it exists, checking for
> migration blockers looks like the right way of doing things anyway.

Actually that's been on my todo list for a long time - for any qemu that 
supports the QMP command that checks for migratability, we should be 
calling this command rather than checking against our own internal list 
  (which is really just an "informed guess") of what can't be migrated. 
This way we'll always get the right answer (or at least what QEMU 
believes to be the right answer :-)). Fixing it this way will also mean 
that migration of VFIO devices will just "magically" start working once 
a migration-supporting driver is written for the device, and the correct 
vfio driver is bound to the device (this latter item is also on my list).

So if you're up for making the patch to call the QMP command, I'd be 
happy to review it!


From abologna at redhat.com  Tue Jul 19 14:17:42 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Tue, 19 Jul 2022 16:17:42 +0200
Subject: [libvirt PATCH 0/3] ci: Fix paths shown in the website
Message-ID: <20220719141745.220912-1-abologna@redhat.com>

Compare

  https://abologna.gitlab.io/-/libvirt/-/jobs/2741293181/artifacts/website/manpages/virtqemud.html#files

with

  https://libvirt.org/manpages/virtqemud.html#files

Andrea Bolognani (3):
  scripts: Port meson-install-web.py to pathlib
  scripts: Add $DESTDIR support to meson-install-web.py
  ci: Fix paths shown in the website

 .gitlab-ci.yml               |  6 +++---
 scripts/meson-install-web.py | 22 ++++++++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

-- 
2.35.3


From abologna at redhat.com  Tue Jul 19 14:17:44 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Tue, 19 Jul 2022 16:17:44 +0200
Subject: [libvirt PATCH 2/3] scripts: Add $DESTDIR support to
 meson-install-web.py
In-Reply-To: <20220719141745.220912-1-abologna@redhat.com>
References: <20220719141745.220912-1-abologna@redhat.com>
Message-ID: <20220719141745.220912-3-abologna@redhat.com>

meson already supports $DESTDIR natively, but in this case
we're using a custom script and so we have to do some extra
work ourselves.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 scripts/meson-install-web.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/scripts/meson-install-web.py b/scripts/meson-install-web.py
index fdf407ba33..e7456fa750 100755
--- a/scripts/meson-install-web.py
+++ b/scripts/meson-install-web.py
@@ -6,10 +6,23 @@ import sys
 
 from pathlib import Path
 
+destdir = os.getenv('DESTDIR')
+if destdir:
+    destdir = Path(destdir)
+    if not destdir.is_absolute():
+        print('$DESTDIR must be an absolute path')
+        sys.exit(1)
+
 for desc in sys.argv[1:]:
     inst = desc.split(':')
     src = Path(inst[0])
     dst = Path(inst[1])
 
+    if destdir:
+        # Turn dst into a relative path by dropping its first component
+        # and append it to destdir to obtain the absolute destination
+        # path that respects the value $DESTDIR found in the environment
+        dst = Path(destdir, *dst.parts[1:])
+
     dst.mkdir(parents=True, exist_ok=True)
     shutil.copy(src, dst)
-- 
2.35.3


From abologna at redhat.com  Tue Jul 19 14:17:43 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Tue, 19 Jul 2022 16:17:43 +0200
Subject: [libvirt PATCH 1/3] scripts: Port meson-install-web.py to pathlib
In-Reply-To: <20220719141745.220912-1-abologna@redhat.com>
References: <20220719141745.220912-1-abologna@redhat.com>
Message-ID: <20220719141745.220912-2-abologna@redhat.com>

This will be useful later.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 scripts/meson-install-web.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/meson-install-web.py b/scripts/meson-install-web.py
index a03f8523cd..fdf407ba33 100755
--- a/scripts/meson-install-web.py
+++ b/scripts/meson-install-web.py
@@ -4,7 +4,12 @@ import os
 import shutil
 import sys
 
+from pathlib import Path
+
 for desc in sys.argv[1:]:
     inst = desc.split(':')
-    os.makedirs(inst[1], exist_ok=True)
-    shutil.copy(inst[0], inst[1])
+    src = Path(inst[0])
+    dst = Path(inst[1])
+
+    dst.mkdir(parents=True, exist_ok=True)
+    shutil.copy(src, dst)
-- 
2.35.3


From abologna at redhat.com  Tue Jul 19 14:17:45 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Tue, 19 Jul 2022 16:17:45 +0200
Subject: [libvirt PATCH 3/3] ci: Fix paths shown in the website
In-Reply-To: <20220719141745.220912-1-abologna@redhat.com>
References: <20220719141745.220912-1-abologna@redhat.com>
Message-ID: <20220719141745.220912-4-abologna@redhat.com>

Right now we're setting the prefix to a custom path, which
results in paths like

  /builds/libvirt/libvirt/vroot/etc/libvirt/virtqemud.conf

ending up in the generated HTML. In order to avoid that,
set the prefix and other installation paths to reasonable
default values by passing

  -Dsystem=true

and then take advantage of $DESTDIR support to still be able
to write the HTML files without requiring root privileges.

Reported-by: Martin Kletzander <mkletzan at redhat.com>
Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a8b89729f..d5c431dee0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,9 +67,9 @@ website:
   before_script:
     - *script_variables
   script:
-    - meson setup build --werror --prefix=$(pwd)/vroot || (cat build/meson-logs/meson-log.txt && exit 1)
-    - ninja -C build install-web
-    - mv vroot/share/doc/libvirt/html/ website
+    - meson setup build --werror -Dsystem=true || (cat build/meson-logs/meson-log.txt && exit 1)
+    - DESTDIR=$(pwd)/install ninja -C build install-web
+    - mv install/usr/share/doc/libvirt/html/ website
   artifacts:
     expose_as: 'Website'
     name: 'website'
-- 
2.35.3


From eperezma at redhat.com  Tue Jul 19 15:09:29 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Tue, 19 Jul 2022 17:09:29 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
Message-ID: <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>

On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
>
> On 7/18/22 11:15 AM, Jiri Denemark wrote:
> > On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
> >> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark <jdenemar at redhat.com> wrote:
> >>> Which in ideal case would mean only a QMP command (such as
> >>> hotplugging a non-migratable device) is the only way to add migration
> >>> blocker. If this is true, than we're safe as libvirt does not allow such
> >>> commands between qemuMigrationSrcIsAllowed and migration start.
> >>>
> >>
> >> Ok, that rules out a few bad use cases. I can do a fast lookup to
> >> check if blockers can be added without the knowledge of libvirt.
> >>
> >>> That said, is there a reason for not implementing the correct solution
> >>> right away as a separate patch?
> >>>
> >>
> >> I was not sure if libvirt already had another way to check, for
> >> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.
> >
> > I'm not aware of such check, but even if it exists, checking for
> > migration blockers looks like the right way of doing things anyway.
>
> Actually that's been on my todo list for a long time - for any qemu that
> supports the QMP command that checks for migratability, we should be
> calling this command rather than checking against our own internal list
>   (which is really just an "informed guess") of what can't be migrated.
> This way we'll always get the right answer (or at least what QEMU
> believes to be the right answer :-)). Fixing it this way will also mean
> that migration of VFIO devices will just "magically" start working once
> a migration-supporting driver is written for the device, and the correct
> vfio driver is bound to the device (this latter item is also on my list).
>
> So if you're up for making the patch to call the QMP command, I'd be
> happy to review it!
>

Thanks! Actually I'd need some guidance first, I'm not very used to
libvirt code.

As I understand I should create a function in qemu_agent.h/c, a getter
similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.

For now it should be enough to delete vdpa hardcoded negation, and
then other parts of libvirt can delete other hardcoded checks, isn't
it?

Thanks!


From jdenemar at redhat.com  Tue Jul 19 15:24:03 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Tue, 19 Jul 2022 17:24:03 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
 <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
Message-ID: <YtbMk/ouCAJQ3G09@orkuz.int.mamuti.net>

On Tue, Jul 19, 2022 at 17:09:29 +0200, Eugenio Perez Martin wrote:
> On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
> > Actually that's been on my todo list for a long time - for any qemu that
> > supports the QMP command that checks for migratability, we should be
> > calling this command rather than checking against our own internal list
> >   (which is really just an "informed guess") of what can't be migrated.
> > This way we'll always get the right answer (or at least what QEMU
> > believes to be the right answer :-)). Fixing it this way will also mean
> > that migration of VFIO devices will just "magically" start working once
> > a migration-supporting driver is written for the device, and the correct
> > vfio driver is bound to the device (this latter item is also on my list).
> >
> > So if you're up for making the patch to call the QMP command, I'd be
> > happy to review it!
> >
> 
> Thanks! Actually I'd need some guidance first, I'm not very used to
> libvirt code.
> 
> As I understand I should create a function in qemu_agent.h/c, a getter
> similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
> qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.

I hope we don't need to ask the guest agent to get migration blockers as
that would be pretty much a show stopper for us. What is the exact way
of getting the info from QEMU?

Jirka

From jjongsma at redhat.com  Tue Jul 19 15:40:46 2022
From: jjongsma at redhat.com (Jonathon Jongsma)
Date: Tue, 19 Jul 2022 10:40:46 -0500
Subject: [libvirt PATCH] conf: add missing break on a switch case
Message-ID: <20220719154046.314662-1-jjongsma@redhat.com>

This was not causing any problems because all cases below were empty,
but in order to avoid future misbehavior, add a break to this case.

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 src/conf/node_device_conf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 51746229fc..364bb489bd 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -770,7 +770,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
                 virNodeDeviceCapMdevTypesFormat(&buf,
                                                 data->ap_matrix.mdev_types,
                                                 data->ap_matrix.nmdev_types);
-
+            break;
         case VIR_NODE_DEV_CAP_MDEV_TYPES:
         case VIR_NODE_DEV_CAP_FC_HOST:
         case VIR_NODE_DEV_CAP_VPORTS:
-- 
2.35.3


From eperezma at redhat.com  Tue Jul 19 15:42:03 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Tue, 19 Jul 2022 17:42:03 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <YtbMk/ouCAJQ3G09@orkuz.int.mamuti.net>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
 <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
 <YtbMk/ouCAJQ3G09@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWfjg8Bs_oD+cn2fCwQZDrJ83MWHvH+Zb4vBNywXXV77rA@mail.gmail.com>

On Tue, Jul 19, 2022 at 5:24 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Tue, Jul 19, 2022 at 17:09:29 +0200, Eugenio Perez Martin wrote:
> > On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
> > > Actually that's been on my todo list for a long time - for any qemu that
> > > supports the QMP command that checks for migratability, we should be
> > > calling this command rather than checking against our own internal list
> > >   (which is really just an "informed guess") of what can't be migrated.
> > > This way we'll always get the right answer (or at least what QEMU
> > > believes to be the right answer :-)). Fixing it this way will also mean
> > > that migration of VFIO devices will just "magically" start working once
> > > a migration-supporting driver is written for the device, and the correct
> > > vfio driver is bound to the device (this latter item is also on my list).
> > >
> > > So if you're up for making the patch to call the QMP command, I'd be
> > > happy to review it!
> > >
> >
> > Thanks! Actually I'd need some guidance first, I'm not very used to
> > libvirt code.
> >
> > As I understand I should create a function in qemu_agent.h/c, a getter
> > similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
> > qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.
>
> I hope we don't need to ask the guest agent to get migration blockers as
> that would be pretty much a show stopper for us. What is the exact way
> of getting the info from QEMU?
>

Sorry, I confused "agent" with the QMP here.

This is an example response with a migration blocker:
<- '{ "execute": "query-migrate" }'
-> {"return": {"blocked-reasons": ["Migration disabled: vhost lacks
VHOST_F_LOG_ALL feature."]}}

There is no member "blocked-reasons" in case no blocker is registered in qemu.

> Jirka
>


From berrange at redhat.com  Tue Jul 19 15:46:10 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Tue, 19 Jul 2022 16:46:10 +0100
Subject: [libvirt PATCH] conf: add missing break on a switch case
In-Reply-To: <20220719154046.314662-1-jjongsma@redhat.com>
References: <20220719154046.314662-1-jjongsma@redhat.com>
Message-ID: <YtbRwnVW6UV3lTBh@redhat.com>

On Tue, Jul 19, 2022 at 10:40:46AM -0500, Jonathon Jongsma wrote:
> This was not causing any problems because all cases below were empty,
> but in order to avoid future misbehavior, add a break to this case.

FYI, future misbehaviour would have been prevented by -Wimplicit-fallthrough.


diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 51746229fc..a920a3cdae 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -776,6 +776,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
         case VIR_NODE_DEV_CAP_VPORTS:
         case VIR_NODE_DEV_CAP_VPD:
         case VIR_NODE_DEV_CAP_LAST:
+            g_printerr("Hello world\n");
             break;
         }
 

$ ninja
...snip...

../src/conf/node_device_conf.c: In function ?virNodeDeviceDefFormat?:
../src/conf/node_device_conf.c:769:16: error: this statement may fall through [-Werror=implicit-fallthrough=]
  769 |             if (data->ap_matrix.flags & VIR_NODE_DEV_CAP_FLAG_AP_MATRIX_MDEV)
      |                ^
../src/conf/node_device_conf.c:774:9: note: here
  774 |         case VIR_NODE_DEV_CAP_MDEV_TYPES:
      |         ^~~~
cc1: all warnings being treated as errors
ninja: build stopped: subcommand failed.

Kinda surprised it doesn't already generate a warning in this situation,
but I guess since there's no code in the later labels, it was considered
harmless.

> 
> Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
> ---
>  src/conf/node_device_conf.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
> index 51746229fc..364bb489bd 100644
> --- a/src/conf/node_device_conf.c
> +++ b/src/conf/node_device_conf.c
> @@ -770,7 +770,7 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
>                  virNodeDeviceCapMdevTypesFormat(&buf,
>                                                  data->ap_matrix.mdev_types,
>                                                  data->ap_matrix.nmdev_types);
> -
> +            break;
>          case VIR_NODE_DEV_CAP_MDEV_TYPES:
>          case VIR_NODE_DEV_CAP_FC_HOST:
>          case VIR_NODE_DEV_CAP_VPORTS:

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From laine at laine.org  Tue Jul 19 16:01:43 2022
From: laine at laine.org (Laine Stump)
Date: Tue, 19 Jul 2022 12:01:43 -0400
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
 <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
Message-ID: <c1c3db51-f9bc-e26b-910a-1d585504cddb@laine.org>

On 7/19/22 11:09 AM, Eugenio Perez Martin wrote:
> On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
>>
>> On 7/18/22 11:15 AM, Jiri Denemark wrote:
>>> On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
>>>> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark <jdenemar at redhat.com> wrote:
>>>>> Which in ideal case would mean only a QMP command (such as
>>>>> hotplugging a non-migratable device) is the only way to add migration
>>>>> blocker. If this is true, than we're safe as libvirt does not allow such
>>>>> commands between qemuMigrationSrcIsAllowed and migration start.
>>>>>
>>>>
>>>> Ok, that rules out a few bad use cases. I can do a fast lookup to
>>>> check if blockers can be added without the knowledge of libvirt.
>>>>
>>>>> That said, is there a reason for not implementing the correct solution
>>>>> right away as a separate patch?
>>>>>
>>>>
>>>> I was not sure if libvirt already had another way to check, for
>>>> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.
>>>
>>> I'm not aware of such check, but even if it exists, checking for
>>> migration blockers looks like the right way of doing things anyway.
>>
>> Actually that's been on my todo list for a long time - for any qemu that
>> supports the QMP command that checks for migratability, we should be
>> calling this command rather than checking against our own internal list
>>    (which is really just an "informed guess") of what can't be migrated.
>> This way we'll always get the right answer (or at least what QEMU
>> believes to be the right answer :-)). Fixing it this way will also mean
>> that migration of VFIO devices will just "magically" start working once
>> a migration-supporting driver is written for the device, and the correct
>> vfio driver is bound to the device (this latter item is also on my list).
>>
>> So if you're up for making the patch to call the QMP command, I'd be
>> happy to review it!
>>
> 
> Thanks! Actually I'd need some guidance first, I'm not very used to
> libvirt code.
> 
> As I understand I should create a function in qemu_agent.h/c, a getter
> similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
> qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.

qemu_agent.c is only for functions that require calling to the QEMU 
guest agent, which is a process running inside the guest. You just need 
to run a simple QMP command. There are some good examples of this in 
qemu_monitor_json.c

> 
> For now it should be enough to delete vdpa hardcoded negation, and
> then other parts of libvirt can delete other hardcoded checks, isn't
> it?

There's just a single function that checks for migratability 
(qemuMigrationSrcIsAllowed()). In theory *everything* in that function 
should be deprecated by just calling qemu to ask. In practice there may 
be / probably are things that qemu doesn't count as "can't migrate" that 
really should be counted that way. Certainly the VDPA and hostdev checks 
should be removable immediately though (although of course this should 
still be checked before pushing!)


What I would do is this:

1) a patch that adds code to the qemu_capabilities to set a flag if the 
desired field in the "query-migrate" QMP command would be filled in by 
this qemu binary.

2) a patch that adds a function to qemu_monitor_json.c to call that 
command and return migratable/not.

3) a patch that adds a call to that function to qemuMigrationSrcIsAllowed().

4) additional patches that remove specific hardcoded checks *only if the 
new field in query-migrate is available (as indicated by the new 
capabilities flag) and returned a definite yes/no (otherwise the checks 
still need to be done, to account for older qemu binaries that don't 
have the qmp command).

I had thought there was a bugzilla somewhere that was tracking this for 
libvirt, but I can't find it.


From jjongsma at redhat.com  Tue Jul 19 16:33:56 2022
From: jjongsma at redhat.com (Jonathon Jongsma)
Date: Tue, 19 Jul 2022 11:33:56 -0500
Subject: [libvirt PATCH] nodedev: support 'mtty' device for testing
Message-ID: <20220719163356.337159-1-jjongsma@redhat.com>

It would be nice to be able to test the mediated device capabilities
without having physical hardware which supports it. The 'mtty' kernel
module presents a virtual parent device which is capable of creating
'fake' mediated devices, and as such it would be useful for testing.

However, the 'mtty' device is not part of an existing device subsystem
(e.g. PCI, etc), so libvirt ignores it and it does not get added to the
node device list. And because it does not get added to the node device
list, it cannot be used to create child mdevs using `virsh
nodedev-create`.

There is already a node device type capability
VIR_NODE_DEV_CAP_MDEV_TYPES that indicates whether a device supports
creating child mediated devices, but libvirt assumes that this is a
nested capability (in other words, it assumes that the primary
capability of a device is something like PCI). If we allow this
MDEV_TYPES capability to be a primary device capability, then we can
support virtual devices like 'mtty' as a parent for mediated devices.

See https://bugzilla.redhat.com/show_bug.cgi?id=2107031

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
---
 src/conf/node_device_conf.c          | 41 +++++++++++++++++++++++++++-
 src/conf/node_device_conf.h          | 13 +++++++++
 src/libvirt_private.syms             |  2 ++
 src/node_device/node_device_driver.c |  5 +++-
 src/node_device/node_device_udev.c   | 25 +++++++++++++++++
 src/util/virmdev.c                   | 28 +++++++++++++++++++
 src/util/virmdev.h                   |  4 +++
 7 files changed, 116 insertions(+), 2 deletions(-)

diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
index 364bb489bd..d5bfc098b2 100644
--- a/src/conf/node_device_conf.c
+++ b/src/conf/node_device_conf.c
@@ -772,6 +772,10 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
                                                 data->ap_matrix.nmdev_types);
             break;
         case VIR_NODE_DEV_CAP_MDEV_TYPES:
+            virNodeDeviceCapMdevTypesFormat(&buf,
+                                            data->mdev_parent.mdev_types,
+                                            data->mdev_parent.nmdev_types);
+            break;
         case VIR_NODE_DEV_CAP_FC_HOST:
         case VIR_NODE_DEV_CAP_VPORTS:
         case VIR_NODE_DEV_CAP_VPD:
@@ -2674,6 +2678,11 @@ virNodeDevCapsDefFree(virNodeDevCapsDef *caps)
         g_free(data->ap_matrix.mdev_types);
         break;
     case VIR_NODE_DEV_CAP_MDEV_TYPES:
+        for (i = 0; i < data->mdev_parent.nmdev_types; i++)
+            virMediatedDeviceTypeFree(data->mdev_parent.mdev_types[i]);
+        g_free(data->mdev_parent.mdev_types);
+        g_free(data->mdev_parent.address);
+        break;
     case VIR_NODE_DEV_CAP_DRM:
     case VIR_NODE_DEV_CAP_FC_HOST:
     case VIR_NODE_DEV_CAP_VPORTS:
@@ -2729,6 +2738,11 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def)
                                                     &cap->data.ap_matrix) < 0)
                 return -1;
             break;
+        case VIR_NODE_DEV_CAP_MDEV_TYPES:
+            if (virNodeDeviceGetMdevParentDynamicCaps(def->sysfs_path,
+                                                      &cap->data.mdev_parent) < 0)
+                return -1;
+            break;
 
             /* all types that (supposedly) don't require any updates
              * relative to what's in the cache.
@@ -2742,7 +2756,6 @@ virNodeDeviceUpdateCaps(virNodeDeviceDef *def)
         case VIR_NODE_DEV_CAP_FC_HOST:
         case VIR_NODE_DEV_CAP_VPORTS:
         case VIR_NODE_DEV_CAP_SCSI_GENERIC:
-        case VIR_NODE_DEV_CAP_MDEV_TYPES:
         case VIR_NODE_DEV_CAP_MDEV:
         case VIR_NODE_DEV_CAP_CCW_DEV:
         case VIR_NODE_DEV_CAP_VDPA:
@@ -3193,6 +3206,24 @@ virNodeDeviceGetAPMatrixDynamicCaps(const char *sysfsPath,
     return 0;
 }
 
+/* virNodeDeviceGetMdevParentDynamicCaps() get info that is stored in sysfs
+ * about devices related to this device, i.e. things that can change
+ * without this device itself changing. These must be refreshed
+ * anytime full XML of the device is requested, because they can
+ * change with no corresponding notification from the kernel/udev.
+ */
+int
+virNodeDeviceGetMdevParentDynamicCaps(const char *sysfsPath,
+                                      virNodeDevCapMdevParent *mdev_parent)
+{
+    if (virNodeDeviceGetMdevTypesCaps(sysfsPath,
+                                      &mdev_parent->mdev_types,
+                                      &mdev_parent->nmdev_types) < 0)
+        return -1;
+    return 0;
+}
+
+
 #else
 
 int
@@ -3229,4 +3260,12 @@ virNodeDeviceGetAPMatrixDynamicCaps(const char *sysfsPath G_GNUC_UNUSED,
     return -1;
 }
 
+int
+virNodeDeviceGetMdevParentDynamicCaps(const char *sysfsPath G_GNUC_UNUSED,
+                                      virNodeDevCapMdevParent *mdev_parent G_GNUC_UNUSED)
+{
+    return -1;
+}
+
+
 #endif /* __linux__ */
diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
index a234b4147b..21622c62ac 100644
--- a/src/conf/node_device_conf.h
+++ b/src/conf/node_device_conf.h
@@ -306,6 +306,14 @@ struct _virNodeDevCapAPMatrix {
     size_t nmdev_types;
 };
 
+
+typedef struct _virNodeDevCapMdevParent virNodeDevCapMdevParent;
+struct _virNodeDevCapMdevParent {
+    virMediatedDeviceType **mdev_types;
+    size_t nmdev_types;
+    char *address;
+};
+
 typedef struct _virNodeDevCapData virNodeDevCapData;
 struct _virNodeDevCapData {
     virNodeDevCapType type;
@@ -327,6 +335,7 @@ struct _virNodeDevCapData {
         virNodeDevCapAPCard ap_card;
         virNodeDevCapAPQueue ap_queue;
         virNodeDevCapAPMatrix ap_matrix;
+        virNodeDevCapMdevParent mdev_parent;
     };
 };
 
@@ -453,6 +462,10 @@ int
 virNodeDeviceGetAPMatrixDynamicCaps(const char *sysfsPath,
                                     virNodeDevCapAPMatrix *ap_matrix);
 
+int
+virNodeDeviceGetMdevParentDynamicCaps(const char *sysfsPath,
+                                      virNodeDevCapMdevParent *mdev_parent);
+
 int
 virNodeDeviceUpdateCaps(virNodeDeviceDef *def);
 
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f4732f1742..1a5fce22e5 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -866,6 +866,7 @@ virNodeDeviceDefParseNode;
 virNodeDeviceDefParseString;
 virNodeDeviceGetAPMatrixDynamicCaps;
 virNodeDeviceGetCSSDynamicCaps;
+virNodeDeviceGetMdevParentDynamicCaps;
 virNodeDeviceGetPCIDynamicCaps;
 virNodeDeviceGetSCSIHostCaps;
 virNodeDeviceGetSCSITargetCaps;
@@ -2723,6 +2724,7 @@ virMediatedDeviceListStealIndex;
 virMediatedDeviceModelTypeFromString;
 virMediatedDeviceModelTypeToString;
 virMediatedDeviceNew;
+virMediatedDeviceParentGetAddress;
 virMediatedDeviceSetUsedBy;
 virMediatedDeviceTypeFree;
 virMediatedDeviceTypeReadAttrs;
diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 0178ae8b66..fa3cfcf24c 100644
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -672,6 +672,10 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj)
             addr = g_strdup(caps->data.ap_matrix.addr);
             break;
 
+        case VIR_NODE_DEV_CAP_MDEV_TYPES:
+            addr = g_strdup(caps->data.mdev_parent.address);
+            break;
+
         case VIR_NODE_DEV_CAP_SYSTEM:
         case VIR_NODE_DEV_CAP_USB_DEV:
         case VIR_NODE_DEV_CAP_USB_INTERFACE:
@@ -684,7 +688,6 @@ nodeDeviceObjFormatAddress(virNodeDeviceObj *obj)
         case VIR_NODE_DEV_CAP_VPORTS:
         case VIR_NODE_DEV_CAP_SCSI_GENERIC:
         case VIR_NODE_DEV_CAP_DRM:
-        case VIR_NODE_DEV_CAP_MDEV_TYPES:
         case VIR_NODE_DEV_CAP_MDEV:
         case VIR_NODE_DEV_CAP_CCW_DEV:
         case VIR_NODE_DEV_CAP_VDPA:
diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
index 3d69bdedae..e76c1a36b8 100644
--- a/src/node_device/node_device_udev.c
+++ b/src/node_device/node_device_udev.c
@@ -457,6 +457,28 @@ udevProcessPCI(struct udev_device *device,
 }
 
 
+static int
+udevProcessMdevParent(struct udev_device *device,
+                      virNodeDeviceDef *def)
+{
+    virNodeDevCapMdevParent *mdev_parent = &def->caps->data.mdev_parent;
+
+    udevGenerateDeviceName(device, def, NULL);
+
+    if (virMediatedDeviceParentGetAddress(def->sysfs_path, &mdev_parent->address) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("Unable to find address for mdev parent device '%s'"),
+                       def->name);
+        return -1;
+    }
+
+    if (virNodeDeviceGetMdevParentDynamicCaps(def->sysfs_path, mdev_parent) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 static int
 drmGetMinorType(int minor)
 {
@@ -1349,6 +1371,8 @@ udevGetDeviceType(struct udev_device *device,
             *type = VIR_NODE_DEV_CAP_VDPA;
         else if (STREQ_NULLABLE(subsystem, "matrix"))
             *type = VIR_NODE_DEV_CAP_AP_MATRIX;
+        else if (STREQ_NULLABLE(subsystem, "mtty"))
+            *type = VIR_NODE_DEV_CAP_MDEV_TYPES;
 
         VIR_FREE(subsystem);
     }
@@ -1404,6 +1428,7 @@ udevGetDeviceDetails(struct udev_device *device,
     case VIR_NODE_DEV_CAP_AP_MATRIX:
         return udevProcessAPMatrix(device, def);
     case VIR_NODE_DEV_CAP_MDEV_TYPES:
+        return udevProcessMdevParent(device, def);
     case VIR_NODE_DEV_CAP_VPD:
     case VIR_NODE_DEV_CAP_SYSTEM:
     case VIR_NODE_DEV_CAP_FC_HOST:
diff --git a/src/util/virmdev.c b/src/util/virmdev.c
index eb566982b1..41d4cef8b9 100644
--- a/src/util/virmdev.c
+++ b/src/util/virmdev.c
@@ -520,6 +520,34 @@ void virMediatedDeviceAttrFree(virMediatedDeviceAttr *attr)
 }
 
 
+#define MDEV_BUS_DIR "/sys/class/mdev_bus"
+
+
+int
+virMediatedDeviceParentGetAddress(const char *sysfspath,
+                                  char **address)
+{
+    g_autoptr(DIR) dir = NULL;
+    struct dirent *entry;
+    if (virDirOpen(&dir, MDEV_BUS_DIR) < 0)
+        return -1;
+
+    /* check if one of the links in /sys/class/mdev_bus/ points at the sysfs
+     * path for this device. If so, the link name is treated as the 'address'
+     * for the mdev parent */
+    while (virDirRead(dir, &entry, MDEV_BUS_DIR) > 0) {
+        g_autofree char *tmppath = g_strdup_printf("%s/%s", MDEV_BUS_DIR,
+                                                   entry->d_name);
+
+        if (virFileLinkPointsTo(tmppath, sysfspath)) {
+            *address = g_strdup(entry->d_name);
+            return 0;
+        }
+    }
+
+    return -1;
+}
+
 #ifdef __linux__
 
 ssize_t
diff --git a/src/util/virmdev.h b/src/util/virmdev.h
index 4d3655a091..bc8306d0e1 100644
--- a/src/util/virmdev.h
+++ b/src/util/virmdev.h
@@ -149,5 +149,9 @@ virMediatedDeviceGetMdevTypes(const char *sysfspath,
                               virMediatedDeviceType ***types,
                               size_t *ntypes);
 
+int
+virMediatedDeviceParentGetAddress(const char *sysfspath,
+                                  char **address);
+
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMediatedDevice, virMediatedDeviceFree);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virMediatedDeviceType, virMediatedDeviceTypeFree);
-- 
2.35.3


From laine at laine.org  Tue Jul 19 16:43:10 2022
From: laine at laine.org (Laine Stump)
Date: Tue, 19 Jul 2022 12:43:10 -0400
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <c1c3db51-f9bc-e26b-910a-1d585504cddb@laine.org>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
 <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
 <c1c3db51-f9bc-e26b-910a-1d585504cddb@laine.org>
Message-ID: <aee19800-ec97-6c0e-9ebd-ac2d174df226@laine.org>

On 7/19/22 12:01 PM, Laine Stump wrote:
> On 7/19/22 11:09 AM, Eugenio Perez Martin wrote:
>> On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
>>>
>>> On 7/18/22 11:15 AM, Jiri Denemark wrote:
>>>> On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
>>>>> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark 
>>>>> <jdenemar at redhat.com> wrote:
>>>>>> Which in ideal case would mean only a QMP command (such as
>>>>>> hotplugging a non-migratable device) is the only way to add migration
>>>>>> blocker. If this is true, than we're safe as libvirt does not 
>>>>>> allow such
>>>>>> commands between qemuMigrationSrcIsAllowed and migration start.
>>>>>>
>>>>>
>>>>> Ok, that rules out a few bad use cases. I can do a fast lookup to
>>>>> check if blockers can be added without the knowledge of libvirt.
>>>>>
>>>>>> That said, is there a reason for not implementing the correct 
>>>>>> solution
>>>>>> right away as a separate patch?
>>>>>>
>>>>>
>>>>> I was not sure if libvirt already had another way to check, for
>>>>> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.
>>>>
>>>> I'm not aware of such check, but even if it exists, checking for
>>>> migration blockers looks like the right way of doing things anyway.
>>>
>>> Actually that's been on my todo list for a long time - for any qemu that
>>> supports the QMP command that checks for migratability, we should be
>>> calling this command rather than checking against our own internal list
>>> ?? (which is really just an "informed guess") of what can't be migrated.
>>> This way we'll always get the right answer (or at least what QEMU
>>> believes to be the right answer :-)). Fixing it this way will also mean
>>> that migration of VFIO devices will just "magically" start working once
>>> a migration-supporting driver is written for the device, and the correct
>>> vfio driver is bound to the device (this latter item is also on my 
>>> list).
>>>
>>> So if you're up for making the patch to call the QMP command, I'd be
>>> happy to review it!
>>>
>>
>> Thanks! Actually I'd need some guidance first, I'm not very used to
>> libvirt code.
>>
>> As I understand I should create a function in qemu_agent.h/c, a getter
>> similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
>> qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.
> 
> qemu_agent.c is only for functions that require calling to the QEMU 
> guest agent, which is a process running inside the guest. You just need 
> to run a simple QMP command. There are some good examples of this in 
> qemu_monitor_json.c
> 
>>
>> For now it should be enough to delete vdpa hardcoded negation, and
>> then other parts of libvirt can delete other hardcoded checks, isn't
>> it?
> 
> There's just a single function that checks for migratability 
> (qemuMigrationSrcIsAllowed()). In theory *everything* in that function 
> should be deprecated by just calling qemu to ask. In practice there may 
> be / probably are things that qemu doesn't count as "can't migrate" that 
> really should be counted that way. Certainly the VDPA and hostdev checks 
> should be removable immediately though (although of course this should 
> still be checked before pushing!)
> 
> 
> What I would do is this:
> 
> 1) a patch that adds code to the qemu_capabilities to set a flag if the 
> desired field in the "query-migrate" QMP command would be filled in by 
> this qemu binary.

Just to permanently document live discussions from IRC:

jjongsma pointed us to a patch he wrote a year ago (but never pushed 
upstream) that implements (1):

https://gitlab.com/jjongsma/libvirt/-/commit/4003b7047058a17465083178d6c0a0f62c900c74

> 
> 2) a patch that adds a function to qemu_monitor_json.c to call that 
> command and return migratable/not.

Thinking about this more, I guess a function that returns the full text 
of "blocked-reason" would be more useful (that way it could be easily 
logged).

> 3) a patch that adds a call to that function to 
> qemuMigrationSrcIsAllowed().
> 
> 4) additional patches that remove specific hardcoded checks *only if the 
> new field in query-migrate is available (as indicated by the new 
> capabilities flag) and returned a definite yes/no (otherwise the checks 
> still need to be done, to account for older qemu binaries that don't 
> have the qmp command).
> 
> I had thought there was a bugzilla somewhere that was tracking this for 
> libvirt, but I can't find it.
> 


From eperezma at redhat.com  Tue Jul 19 18:38:49 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Tue, 19 Jul 2022 20:38:49 +0200
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <aee19800-ec97-6c0e-9ebd-ac2d174df226@laine.org>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
 <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
 <c1c3db51-f9bc-e26b-910a-1d585504cddb@laine.org>
 <aee19800-ec97-6c0e-9ebd-ac2d174df226@laine.org>
Message-ID: <CAJaqyWeQM3gfHFjUg03JvrWMOpBOkotdbE-t4wkJJ7qXDZ7X3Q@mail.gmail.com>

On Tue, Jul 19, 2022 at 6:43 PM Laine Stump <laine at laine.org> wrote:
>
> On 7/19/22 12:01 PM, Laine Stump wrote:
> > On 7/19/22 11:09 AM, Eugenio Perez Martin wrote:
> >> On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
> >>>
> >>> On 7/18/22 11:15 AM, Jiri Denemark wrote:
> >>>> On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
> >>>>> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark
> >>>>> <jdenemar at redhat.com> wrote:
> >>>>>> Which in ideal case would mean only a QMP command (such as
> >>>>>> hotplugging a non-migratable device) is the only way to add migration
> >>>>>> blocker. If this is true, than we're safe as libvirt does not
> >>>>>> allow such
> >>>>>> commands between qemuMigrationSrcIsAllowed and migration start.
> >>>>>>
> >>>>>
> >>>>> Ok, that rules out a few bad use cases. I can do a fast lookup to
> >>>>> check if blockers can be added without the knowledge of libvirt.
> >>>>>
> >>>>>> That said, is there a reason for not implementing the correct
> >>>>>> solution
> >>>>>> right away as a separate patch?
> >>>>>>
> >>>>>
> >>>>> I was not sure if libvirt already had another way to check, for
> >>>>> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.
> >>>>
> >>>> I'm not aware of such check, but even if it exists, checking for
> >>>> migration blockers looks like the right way of doing things anyway.
> >>>
> >>> Actually that's been on my todo list for a long time - for any qemu that
> >>> supports the QMP command that checks for migratability, we should be
> >>> calling this command rather than checking against our own internal list
> >>>    (which is really just an "informed guess") of what can't be migrated.
> >>> This way we'll always get the right answer (or at least what QEMU
> >>> believes to be the right answer :-)). Fixing it this way will also mean
> >>> that migration of VFIO devices will just "magically" start working once
> >>> a migration-supporting driver is written for the device, and the correct
> >>> vfio driver is bound to the device (this latter item is also on my
> >>> list).
> >>>
> >>> So if you're up for making the patch to call the QMP command, I'd be
> >>> happy to review it!
> >>>
> >>
> >> Thanks! Actually I'd need some guidance first, I'm not very used to
> >> libvirt code.
> >>
> >> As I understand I should create a function in qemu_agent.h/c, a getter
> >> similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
> >> qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.
> >
> > qemu_agent.c is only for functions that require calling to the QEMU
> > guest agent, which is a process running inside the guest. You just need
> > to run a simple QMP command. There are some good examples of this in
> > qemu_monitor_json.c
> >
> >>
> >> For now it should be enough to delete vdpa hardcoded negation, and
> >> then other parts of libvirt can delete other hardcoded checks, isn't
> >> it?
> >
> > There's just a single function that checks for migratability
> > (qemuMigrationSrcIsAllowed()). In theory *everything* in that function
> > should be deprecated by just calling qemu to ask. In practice there may
> > be / probably are things that qemu doesn't count as "can't migrate" that
> > really should be counted that way. Certainly the VDPA and hostdev checks
> > should be removable immediately though (although of course this should
> > still be checked before pushing!)
> >
> >
> > What I would do is this:
> >
> > 1) a patch that adds code to the qemu_capabilities to set a flag if the
> > desired field in the "query-migrate" QMP command would be filled in by
> > this qemu binary.
>
> Just to permanently document live discussions from IRC:
>
> jjongsma pointed us to a patch he wrote a year ago (but never pushed
> upstream) that implements (1):
>
> https://gitlab.com/jjongsma/libvirt/-/commit/4003b7047058a17465083178d6c0a0f62c900c74
>

Thanks!

> >
> > 2) a patch that adds a function to qemu_monitor_json.c to call that
> > command and return migratable/not.
>
> Thinking about this more, I guess a function that returns the full text
> of "blocked-reason" would be more useful (that way it could be easily
> logged).
>

I'm actually returned all the array in the form of `char ***`

> > 3) a patch that adds a call to that function to
> > qemuMigrationSrcIsAllowed().
> >

What I cannot find an example of is how to get the qemuMonitor from
the virQEMUDriver that qemuMigrationSrcIsAllowed has as the parameter.

> > 4) additional patches that remove specific hardcoded checks *only if the
> > new field in query-migrate is available (as indicated by the new
> > capabilities flag) and returned a definite yes/no (otherwise the checks
> > still need to be done, to account for older qemu binaries that don't
> > have the qmp command).
> >

Yes, I agree.

Thanks!

> > I had thought there was a bugzilla somewhere that was tracking this for
> > libvirt, but I can't find it.
> >
>


From jfehlig at suse.com  Tue Jul 19 23:51:57 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Tue, 19 Jul 2022 17:51:57 -0600
Subject: [PATCH] spec: Restart sockets even when libvirtd is inactive
Message-ID: <20220719235157.15653-1-jfehlig@suse.com>

By default libvirtd will terminate itself after 120 seconds, so it is
likely that the daemon will not be running at package upgrade. Try
restarting sockets even if the daemon is inactive.

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---

Assuming sockets need restarted on package update?

 libvirt.spec.in | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 9d788b790f..5201a14431 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1365,16 +1365,19 @@ then
         # 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
+        is_active=no
         /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1
         if test $? = 0
         then
+            is_active=yes
             /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
-
-            /bin/systemctl try-restart \
-                    libvirtd.socket \
-                    libvirtd-ro.socket \
-                    libvirtd-admin.socket >/dev/null 2>&1 || :
-
+        fi
+        /bin/systemctl try-restart \
+                libvirtd.socket \
+                libvirtd-ro.socket \
+                libvirtd-admin.socket >/dev/null 2>&1 || :
+        if test "$is_active" = yes
+        then
             /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
         fi
     fi
-- 
2.36.1


From laine at laine.org  Wed Jul 20 03:08:00 2022
From: laine at laine.org (Laine Stump)
Date: Tue, 19 Jul 2022 23:08:00 -0400
Subject: [libvirt PATCH] qemu_migration: Delete vDPA check
In-Reply-To: <CAJaqyWeQM3gfHFjUg03JvrWMOpBOkotdbE-t4wkJJ7qXDZ7X3Q@mail.gmail.com>
References: <20220715091458.2620872-1-eperezma@redhat.com>
 <YtUY9cnvBRgGmiOQ@orkuz.int.mamuti.net>
 <CAJaqyWdLrpNjFZp+sJ1Atr882Whbwb2eySEMDUTjS=JKhcrehg@mail.gmail.com>
 <YtV5EVTnR06HNbaV@orkuz.int.mamuti.net>
 <e3399942-c06c-d43a-5652-facdd8e0cbcc@laine.org>
 <CAJaqyWfB=4_tnYQnyTuHGWCfpoJjgYrrX1ev70AoJQVREYvwCg@mail.gmail.com>
 <c1c3db51-f9bc-e26b-910a-1d585504cddb@laine.org>
 <aee19800-ec97-6c0e-9ebd-ac2d174df226@laine.org>
 <CAJaqyWeQM3gfHFjUg03JvrWMOpBOkotdbE-t4wkJJ7qXDZ7X3Q@mail.gmail.com>
Message-ID: <27769bb3-14ce-f36b-ee24-8f1f15434f6d@laine.org>

On 7/19/22 2:38 PM, Eugenio Perez Martin wrote:
> On Tue, Jul 19, 2022 at 6:43 PM Laine Stump <laine at laine.org> wrote:
>>
>> On 7/19/22 12:01 PM, Laine Stump wrote:
>>> On 7/19/22 11:09 AM, Eugenio Perez Martin wrote:
>>>> On Tue, Jul 19, 2022 at 4:02 PM Laine Stump <laine at laine.org> wrote:
>>>>>
>>>>> On 7/18/22 11:15 AM, Jiri Denemark wrote:
>>>>>> On Mon, Jul 18, 2022 at 10:40:56 +0200, Eugenio Perez Martin wrote:
>>>>>>> On Mon, Jul 18, 2022 at 10:25 AM Jiri Denemark
>>>>>>> <jdenemar at redhat.com> wrote:
>>>>>>>> Which in ideal case would mean only a QMP command (such as
>>>>>>>> hotplugging a non-migratable device) is the only way to add migration
>>>>>>>> blocker. If this is true, than we're safe as libvirt does not
>>>>>>>> allow such
>>>>>>>> commands between qemuMigrationSrcIsAllowed and migration start.
>>>>>>>>
>>>>>>>
>>>>>>> Ok, that rules out a few bad use cases. I can do a fast lookup to
>>>>>>> check if blockers can be added without the knowledge of libvirt.
>>>>>>>
>>>>>>>> That said, is there a reason for not implementing the correct
>>>>>>>> solution
>>>>>>>> right away as a separate patch?
>>>>>>>>
>>>>>>>
>>>>>>> I was not sure if libvirt already had another way to check, for
>>>>>>> example, if the vhost device didn't have VHOST_F_LOG_ALL feature.
>>>>>>
>>>>>> I'm not aware of such check, but even if it exists, checking for
>>>>>> migration blockers looks like the right way of doing things anyway.
>>>>>
>>>>> Actually that's been on my todo list for a long time - for any qemu that
>>>>> supports the QMP command that checks for migratability, we should be
>>>>> calling this command rather than checking against our own internal list
>>>>>     (which is really just an "informed guess") of what can't be migrated.
>>>>> This way we'll always get the right answer (or at least what QEMU
>>>>> believes to be the right answer :-)). Fixing it this way will also mean
>>>>> that migration of VFIO devices will just "magically" start working once
>>>>> a migration-supporting driver is written for the device, and the correct
>>>>> vfio driver is bound to the device (this latter item is also on my
>>>>> list).
>>>>>
>>>>> So if you're up for making the patch to call the QMP command, I'd be
>>>>> happy to review it!
>>>>>
>>>>
>>>> Thanks! Actually I'd need some guidance first, I'm not very used to
>>>> libvirt code.
>>>>
>>>> As I understand I should create a function in qemu_agent.h/c, a getter
>>>> similar to qemuAgentGetFSInfo. How can I get a qemuAgent from
>>>> qemuMigrationSrcIsAllowed? I only have a virQEMUDriver there.
>>>
>>> qemu_agent.c is only for functions that require calling to the QEMU
>>> guest agent, which is a process running inside the guest. You just need
>>> to run a simple QMP command. There are some good examples of this in
>>> qemu_monitor_json.c
>>>
>>>>
>>>> For now it should be enough to delete vdpa hardcoded negation, and
>>>> then other parts of libvirt can delete other hardcoded checks, isn't
>>>> it?
>>>
>>> There's just a single function that checks for migratability
>>> (qemuMigrationSrcIsAllowed()). In theory *everything* in that function
>>> should be deprecated by just calling qemu to ask. In practice there may
>>> be / probably are things that qemu doesn't count as "can't migrate" that
>>> really should be counted that way. Certainly the VDPA and hostdev checks
>>> should be removable immediately though (although of course this should
>>> still be checked before pushing!)
>>>
>>>
>>> What I would do is this:
>>>
>>> 1) a patch that adds code to the qemu_capabilities to set a flag if the
>>> desired field in the "query-migrate" QMP command would be filled in by
>>> this qemu binary.
>>
>> Just to permanently document live discussions from IRC:
>>
>> jjongsma pointed us to a patch he wrote a year ago (but never pushed
>> upstream) that implements (1):
>>
>> https://gitlab.com/jjongsma/libvirt/-/commit/4003b7047058a17465083178d6c0a0f62c900c74
>>
> 
> Thanks!
> 
>>>
>>> 2) a patch that adds a function to qemu_monitor_json.c to call that
>>> command and return migratable/not.
>>
>> Thinking about this more, I guess a function that returns the full text
>> of "blocked-reason" would be more useful (that way it could be easily
>> logged).
>>
> 
> I'm actually returned all the array in the form of `char ***`
> 
>>> 3) a patch that adds a call to that function to
>>> qemuMigrationSrcIsAllowed().
>>>
> 
> What I cannot find an example of is how to get the qemuMonitor from
> the virQEMUDriver that qemuMigrationSrcIsAllowed has as the parameter.

Hopefully I'm not leading you down a false path, but it looks like the 
call chain of:

    qemuDomainChangeMemoryRequestedSize()
      qemuMonitorChangeMemoryRequestedSize()
        qemuMonitorJSONChangeMemoryRequestedSize()

contains all the bits you need, including the toplevel function that 
calls qemuDomainObj(Enter|Exit)Monitor() and grabs the qemuMonitor 
object from the domainObj's privateData before calling down to a wrapper 
function in qemu_monitor.c (that I think was originally there because 
there could be either an old-style shell-like command or a QMP command 
to do the same thing), and then from there down to the QMP/JSON function 
in qemu_monitor_json.c that actually calls the monitor.


> 
>>> 4) additional patches that remove specific hardcoded checks *only if the
>>> new field in query-migrate is available (as indicated by the new
>>> capabilities flag) and returned a definite yes/no (otherwise the checks
>>> still need to be done, to account for older qemu binaries that don't
>>> have the qmp command).
>>>
> 
> Yes, I agree.
> 
> Thanks!
> 
>>> I had thought there was a bugzilla somewhere that was tracking this for
>>> libvirt, but I can't find it.
>>>
>>
> 


From mprivozn at redhat.com  Wed Jul 20 06:36:27 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 20 Jul 2022 08:36:27 +0200
Subject: [PATCH 0/2] schemas: Drop <interleave/> from capabilities schemas
Message-ID: <cover.1658298964.git.mprivozn@redhat.com>

*** BLURB HERE ***

Michal Pr?vozn?k (2):
  capabilityschemadata: Fix order of <features/> in caps-test2.xml
  schemas: Drop <interleave/> from capabilities schemas

 src/conf/schemas/capability.rng           | 160 +++++++++++-----------
 src/conf/schemas/domaincaps.rng           |  80 +++++------
 tests/capabilityschemadata/caps-test2.xml |   8 +-
 3 files changed, 119 insertions(+), 129 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 20 06:36:28 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 20 Jul 2022 08:36:28 +0200
Subject: [PATCH 1/2] capabilityschemadata: Fix order of <features/> in
 caps-test2.xml
In-Reply-To: <cover.1658298964.git.mprivozn@redhat.com>
References: <cover.1658298964.git.mprivozn@redhat.com>
Message-ID: <dc18f86f3e272fb4c3d3d45e219aaec9798b123f.1658298964.git.mprivozn@redhat.com>

The guest <features/> is formatted in
virCapabilitiesFormatGuestFeatures() and the order in which
individual child elements are formatted is fixed, because the
function iterates over the virCapsGuestFeatureType enum
(possibly) formatting each member until _LAST is met.

Therefore, <cpuselection/> and <deviceboot/> can't ever be
formatted first. Move these elements to proper location.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/capabilityschemadata/caps-test2.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/capabilityschemadata/caps-test2.xml b/tests/capabilityschemadata/caps-test2.xml
index 125a322998..bf18010440 100644
--- a/tests/capabilityschemadata/caps-test2.xml
+++ b/tests/capabilityschemadata/caps-test2.xml
@@ -72,12 +72,12 @@
       </domain>
     </arch>
     <features>
-      <cpuselection/>
-      <deviceboot/>
       <pae/>
       <nonpae/>
       <acpi default='on' toggle='yes'/>
       <apic default='on' toggle='no'/>
+      <cpuselection/>
+      <deviceboot/>
     </features>
   </guest>
 
@@ -114,10 +114,10 @@
       </domain>
     </arch>
     <features>
-      <cpuselection/>
-      <deviceboot/>
       <acpi default='on' toggle='yes'/>
       <apic default='on' toggle='no'/>
+      <cpuselection/>
+      <deviceboot/>
     </features>
   </guest>
 
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 20 06:36:29 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 20 Jul 2022 08:36:29 +0200
Subject: [PATCH 2/2] schemas: Drop <interleave/> from capabilities schemas
In-Reply-To: <cover.1658298964.git.mprivozn@redhat.com>
References: <cover.1658298964.git.mprivozn@redhat.com>
Message-ID: <9a597c62f6baf4f423a8907fb16cfade416d5852.1658298964.git.mprivozn@redhat.com>

Currently, we have two types of output only XMLs: capabilities
and domaincapabilities. Neither of these is ever parsed.
Moreover, the order of elements inside these two documents is
well defined by their respective format functions. Therefore,
there's no need to have <interleave/> anywhere in their
corresponding schemas.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/schemas/capability.rng | 160 +++++++++++++++-----------------
 src/conf/schemas/domaincaps.rng |  80 ++++++++--------
 2 files changed, 115 insertions(+), 125 deletions(-)

diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng
index c7e72c6f39..7a24b2a076 100644
--- a/src/conf/schemas/capability.rng
+++ b/src/conf/schemas/capability.rng
@@ -53,44 +53,40 @@
 
   <define name="secmodel">
     <element name="secmodel">
-      <interleave>
-        <element name="model">
-          <text/>
-        </element>
-        <element name="doi">
-          <text/>
-        </element>
-        <zeroOrMore>
-          <element name="baselabel">
-            <attribute name="type">
-              <text/>
-            </attribute>
+      <element name="model">
+        <text/>
+      </element>
+      <element name="doi">
+        <text/>
+      </element>
+      <zeroOrMore>
+        <element name="baselabel">
+          <attribute name="type">
             <text/>
-          </element>
-        </zeroOrMore>
-      </interleave>
+          </attribute>
+          <text/>
+        </element>
+      </zeroOrMore>
     </element>
   </define>
 
   <define name="power_management">
     <element name="power_management">
-      <interleave>
-        <optional>
-          <element name="suspend_mem">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="suspend_disk">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="suspend_hybrid">
-            <empty/>
-          </element>
-        </optional>
-      </interleave>
+      <optional>
+        <element name="suspend_mem">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="suspend_disk">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="suspend_hybrid">
+          <empty/>
+        </element>
+      </optional>
     </element>
   </define>
 
@@ -442,57 +438,55 @@
 
   <define name="features">
     <element name="features">
-      <interleave>
-        <optional>
-          <element name="pae">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="nonpae">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="ia64_be">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="acpi">
-            <ref name="featuretoggle"/>
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="apic">
-            <ref name="featuretoggle"/>
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="cpuselection">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="deviceboot">
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="disksnapshot">
-            <ref name="featuretoggle"/>
-            <empty/>
-          </element>
-        </optional>
-        <optional>
-          <element name="hap">
-            <ref name="featuretoggle"/>
-            <empty/>
-          </element>
-        </optional>
-      </interleave>
+      <optional>
+        <element name="pae">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="nonpae">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="ia64_be">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="acpi">
+          <ref name="featuretoggle"/>
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="apic">
+          <ref name="featuretoggle"/>
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="cpuselection">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="deviceboot">
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="disksnapshot">
+          <ref name="featuretoggle"/>
+          <empty/>
+        </element>
+      </optional>
+      <optional>
+        <element name="hap">
+          <ref name="featuretoggle"/>
+          <empty/>
+        </element>
+      </optional>
     </element>
   </define>
 
diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng
index 9cbc2467ab..331fdbb1e9 100644
--- a/src/conf/schemas/domaincaps.rng
+++ b/src/conf/schemas/domaincaps.rng
@@ -10,43 +10,41 @@
 
   <define name="domainCapabilities">
     <element name="domainCapabilities">
-      <interleave>
-        <element name="path">
-          <ref name="absFilePath"/>
-        </element>
-        <element name="domain">
-          <text/>
-        </element>
-        <optional>
-          <element name="machine">
-            <text/>
-          </element>
-        </optional>
-        <element name="arch">
+      <element name="path">
+        <ref name="absFilePath"/>
+      </element>
+      <element name="domain">
+        <text/>
+      </element>
+      <optional>
+        <element name="machine">
           <text/>
         </element>
-        <optional>
-          <ref name="vcpu"/>
-        </optional>
-        <optional>
-          <ref name="iothreads"/>
-        </optional>
-        <optional>
-          <ref name="os"/>
-        </optional>
-        <optional>
-          <ref name="cpu"/>
-        </optional>
-        <optional>
-          <ref name="memoryBacking"/>
-        </optional>
-        <optional>
-          <ref name="devices"/>
-        </optional>
-        <optional>
-          <ref name="features"/>
-        </optional>
-      </interleave>
+      </optional>
+      <element name="arch">
+        <text/>
+      </element>
+      <optional>
+        <ref name="vcpu"/>
+      </optional>
+      <optional>
+        <ref name="iothreads"/>
+      </optional>
+      <optional>
+        <ref name="os"/>
+      </optional>
+      <optional>
+        <ref name="cpu"/>
+      </optional>
+      <optional>
+        <ref name="memoryBacking"/>
+      </optional>
+      <optional>
+        <ref name="devices"/>
+      </optional>
+      <optional>
+        <ref name="features"/>
+      </optional>
     </element>
   </define>
 
@@ -78,13 +76,11 @@
 
   <define name="os">
     <element name="os">
-      <interleave>
-        <ref name="supported"/>
-        <ref name="enum"/>
-        <optional>
-          <ref name="loader"/>
-        </optional>
-      </interleave>
+      <ref name="supported"/>
+      <ref name="enum"/>
+      <optional>
+        <ref name="loader"/>
+      </optional>
     </element>
   </define>
 
-- 
2.35.1


From mkletzan at redhat.com  Wed Jul 20 08:00:30 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Wed, 20 Jul 2022 10:00:30 +0200
Subject: [PATCH] spec: Restart sockets even when libvirtd is inactive
In-Reply-To: <20220719235157.15653-1-jfehlig@suse.com>
References: <20220719235157.15653-1-jfehlig@suse.com>
Message-ID: <Yte2HsoiZA5ZZ3tb@wheatley>

On Tue, Jul 19, 2022 at 05:51:57PM -0600, Jim Fehlig wrote:
>By default libvirtd will terminate itself after 120 seconds, so it is
>likely that the daemon will not be running at package upgrade. Try
>restarting sockets even if the daemon is inactive.
>
>Signed-off-by: Jim Fehlig <jfehlig at suse.com>
>---
>
>Assuming sockets need restarted on package update?
>

Probably not, but just in case there is a configuration change I think
it is safer to have this here.

> libvirt.spec.in | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/libvirt.spec.in b/libvirt.spec.in
>index 9d788b790f..5201a14431 100644
>--- a/libvirt.spec.in
>+++ b/libvirt.spec.in
>@@ -1365,16 +1365,19 @@ then
>         # 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
>+        is_active=no
>         /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1
>         if test $? = 0

I think this is not needed because this whole function is only called
when the daemon was active (see libvirt_daemon_schedule_restart and
libvirt_daemon_needs_restart).

That could make this whole thing even easier.

>         then
>+            is_active=yes
>             /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
>-
>-            /bin/systemctl try-restart \
>-                    libvirtd.socket \
>-                    libvirtd-ro.socket \
>-                    libvirtd-admin.socket >/dev/null 2>&1 || :
>-
>+        fi
>+        /bin/systemctl try-restart \
>+                libvirtd.socket \
>+                libvirtd-ro.socket \
>+                libvirtd-admin.socket >/dev/null 2>&1 || :
>+        if test "$is_active" = yes
>+        then
>             /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
>         fi
>     fi
>-- 
>2.36.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220720/dab6e564/attachment.sig>

From berrange at redhat.com  Wed Jul 20 08:42:15 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 20 Jul 2022 09:42:15 +0100
Subject: [PATCH 2/2] schemas: Drop <interleave/> from capabilities schemas
In-Reply-To: <9a597c62f6baf4f423a8907fb16cfade416d5852.1658298964.git.mprivozn@redhat.com>
References: <cover.1658298964.git.mprivozn@redhat.com>
 <9a597c62f6baf4f423a8907fb16cfade416d5852.1658298964.git.mprivozn@redhat.com>
Message-ID: <Yte/5zxtH015P9h/@redhat.com>

On Wed, Jul 20, 2022 at 08:36:29AM +0200, Michal Privoznik wrote:
> Currently, we have two types of output only XMLs: capabilities
> and domaincapabilities. Neither of these is ever parsed.
> Moreover, the order of elements inside these two documents is
> well defined by their respective format functions. Therefore,
> there's no need to have <interleave/> anywhere in their
> corresponding schemas.

The consumers of libvirt need to parse the XML, and they may wish
to use the RNG files to validate. If the libvirt XML formatter has
ever, or will ever, change ordering of elements, our RNG should
be prepared for that. IOW, we should consider the RNG to be something
that must validate XML output by all previous versions of libvirt.
How confident can we be that we've never changed the order of
any elements ?  IMHO its best practice to always use <interleave/>

> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/conf/schemas/capability.rng | 160 +++++++++++++++-----------------
>  src/conf/schemas/domaincaps.rng |  80 ++++++++--------
>  2 files changed, 115 insertions(+), 125 deletions(-)
> 
> diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng
> index c7e72c6f39..7a24b2a076 100644
> --- a/src/conf/schemas/capability.rng
> +++ b/src/conf/schemas/capability.rng
> @@ -53,44 +53,40 @@
>  
>    <define name="secmodel">
>      <element name="secmodel">
> -      <interleave>
> -        <element name="model">
> -          <text/>
> -        </element>
> -        <element name="doi">
> -          <text/>
> -        </element>
> -        <zeroOrMore>
> -          <element name="baselabel">
> -            <attribute name="type">
> -              <text/>
> -            </attribute>
> +      <element name="model">
> +        <text/>
> +      </element>
> +      <element name="doi">
> +        <text/>
> +      </element>
> +      <zeroOrMore>
> +        <element name="baselabel">
> +          <attribute name="type">
>              <text/>
> -          </element>
> -        </zeroOrMore>
> -      </interleave>
> +          </attribute>
> +          <text/>
> +        </element>
> +      </zeroOrMore>
>      </element>
>    </define>
>  
>    <define name="power_management">
>      <element name="power_management">
> -      <interleave>
> -        <optional>
> -          <element name="suspend_mem">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="suspend_disk">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="suspend_hybrid">
> -            <empty/>
> -          </element>
> -        </optional>
> -      </interleave>
> +      <optional>
> +        <element name="suspend_mem">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="suspend_disk">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="suspend_hybrid">
> +          <empty/>
> +        </element>
> +      </optional>
>      </element>
>    </define>
>  
> @@ -442,57 +438,55 @@
>  
>    <define name="features">
>      <element name="features">
> -      <interleave>
> -        <optional>
> -          <element name="pae">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="nonpae">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="ia64_be">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="acpi">
> -            <ref name="featuretoggle"/>
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="apic">
> -            <ref name="featuretoggle"/>
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="cpuselection">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="deviceboot">
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="disksnapshot">
> -            <ref name="featuretoggle"/>
> -            <empty/>
> -          </element>
> -        </optional>
> -        <optional>
> -          <element name="hap">
> -            <ref name="featuretoggle"/>
> -            <empty/>
> -          </element>
> -        </optional>
> -      </interleave>
> +      <optional>
> +        <element name="pae">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="nonpae">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="ia64_be">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="acpi">
> +          <ref name="featuretoggle"/>
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="apic">
> +          <ref name="featuretoggle"/>
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="cpuselection">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="deviceboot">
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="disksnapshot">
> +          <ref name="featuretoggle"/>
> +          <empty/>
> +        </element>
> +      </optional>
> +      <optional>
> +        <element name="hap">
> +          <ref name="featuretoggle"/>
> +          <empty/>
> +        </element>
> +      </optional>
>      </element>
>    </define>
>  
> diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng
> index 9cbc2467ab..331fdbb1e9 100644
> --- a/src/conf/schemas/domaincaps.rng
> +++ b/src/conf/schemas/domaincaps.rng
> @@ -10,43 +10,41 @@
>  
>    <define name="domainCapabilities">
>      <element name="domainCapabilities">
> -      <interleave>
> -        <element name="path">
> -          <ref name="absFilePath"/>
> -        </element>
> -        <element name="domain">
> -          <text/>
> -        </element>
> -        <optional>
> -          <element name="machine">
> -            <text/>
> -          </element>
> -        </optional>
> -        <element name="arch">
> +      <element name="path">
> +        <ref name="absFilePath"/>
> +      </element>
> +      <element name="domain">
> +        <text/>
> +      </element>
> +      <optional>
> +        <element name="machine">
>            <text/>
>          </element>
> -        <optional>
> -          <ref name="vcpu"/>
> -        </optional>
> -        <optional>
> -          <ref name="iothreads"/>
> -        </optional>
> -        <optional>
> -          <ref name="os"/>
> -        </optional>
> -        <optional>
> -          <ref name="cpu"/>
> -        </optional>
> -        <optional>
> -          <ref name="memoryBacking"/>
> -        </optional>
> -        <optional>
> -          <ref name="devices"/>
> -        </optional>
> -        <optional>
> -          <ref name="features"/>
> -        </optional>
> -      </interleave>
> +      </optional>
> +      <element name="arch">
> +        <text/>
> +      </element>
> +      <optional>
> +        <ref name="vcpu"/>
> +      </optional>
> +      <optional>
> +        <ref name="iothreads"/>
> +      </optional>
> +      <optional>
> +        <ref name="os"/>
> +      </optional>
> +      <optional>
> +        <ref name="cpu"/>
> +      </optional>
> +      <optional>
> +        <ref name="memoryBacking"/>
> +      </optional>
> +      <optional>
> +        <ref name="devices"/>
> +      </optional>
> +      <optional>
> +        <ref name="features"/>
> +      </optional>
>      </element>
>    </define>
>  
> @@ -78,13 +76,11 @@
>  
>    <define name="os">
>      <element name="os">
> -      <interleave>
> -        <ref name="supported"/>
> -        <ref name="enum"/>
> -        <optional>
> -          <ref name="loader"/>
> -        </optional>
> -      </interleave>
> +      <ref name="supported"/>
> +      <ref name="enum"/>
> +      <optional>
> +        <ref name="loader"/>
> +      </optional>
>      </element>
>    </define>
>  
> -- 
> 2.35.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From zhe.he at windriver.com  Wed Jul 20 08:41:20 2022
From: zhe.he at windriver.com (He Zhe)
Date: Wed, 20 Jul 2022 16:41:20 +0800
Subject: [PATCH] remote: Make remote_daemon depend on qemu_protocol.h
Message-ID: <20220720084120.14207-1-zhe.he@windriver.com>

We sometimes meet the following parallel compililation issue, since
remote_daemon depends on remote_protocol.h qemu_protocol.h and lxc_protocol.h,
which are usually generated due to remote_driver .

| FAILED: src/virtnetworkd.p/remote_remote_daemon_dispatch.c.o
| x86_64-wrs-linux-gcc ...
| In file included from ../libvirt-8.1.0/src/remote/remote_daemon_dispatch.c:26:
| ../libvirt-8.1.0/src/remote/remote_daemon.h:30:10: fatal error: qemu_protocol.h: No such file or directory
|    30 | #include "qemu_protocol.h"
|       |          ^~~~~~~~~~~~~~~~~
| compilation terminated.

This patch adds the headers as dependencies of remote_daemon to make sure they
are always in place in advance.

Signed-off-by: He Zhe <zhe.he at windriver.com>
---
 src/remote/meson.build | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/remote/meson.build b/src/remote/meson.build
index eb4f7a0068..04525fb4a6 100644
--- a/src/remote/meson.build
+++ b/src/remote/meson.build
@@ -5,6 +5,15 @@ remote_driver_sources = [
 
 remote_driver_generated = []
 
+remote_daemon_sources = files(
+  'remote_daemon.c',
+  'remote_daemon_config.c',
+  'remote_daemon_dispatch.c',
+  'remote_daemon_stream.c',
+)
+
+remote_daemon_generated = []
+
 foreach name : [ 'remote', 'qemu', 'lxc' ]
   client_bodies_h = '@0 at _client_bodies.h'.format(name)
   protocol_c = '@0 at _protocol.c'.format(name)
@@ -21,7 +30,7 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
     capture: true,
   )
 
-  remote_driver_generated += custom_target(
+  protocol_h_generated = custom_target(
     protocol_h,
     input: protocol_x,
     output: protocol_h,
@@ -30,6 +39,9 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
     ],
   )
 
+  remote_driver_generated += protocol_h_generated
+  remote_daemon_generated += protocol_h_generated
+
   remote_driver_generated += custom_target(
     protocol_c,
     input: protocol_x,
@@ -42,15 +54,6 @@ foreach name : [ 'remote', 'qemu', 'lxc' ]
   rpc_probe_files += files(protocol_x)
 endforeach
 
-remote_daemon_sources = files(
-  'remote_daemon.c',
-  'remote_daemon_config.c',
-  'remote_daemon_dispatch.c',
-  'remote_daemon_stream.c',
-)
-
-remote_daemon_generated = []
-
 virt_ssh_helper_sources = files(
   'remote_sockets.c',
   'remote_ssh_helper.c',
-- 
2.17.1


From eperezma at redhat.com  Wed Jul 20 09:11:49 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 11:11:49 +0200
Subject: [libvirt PATCH v2 0/5] Ask qemu about migration blockers
Message-ID: <20220720091154.3135061-1-eperezma@redhat.com>

There are some hardcoded migration blockers in libvirt, like having a net
vhost-vdpa device. While it's true that they cannot be migrated at the moment,
there are plans to be able to migrate them soon.

They'll put a migration blockers in the cases where you cannot migrate them.
Ask qemu about then before rejecting the migration. In case the question is not
possible, assume they're not migratable.

Eugenio P?rez (4):
  qemu_monitor_json: Add qemuMonitorJSONGetMigrationBlockers
  qemu_monitor: add support for get qemu migration blockers
  qemu_migration: get migration blockers before hardcoded checks
  qemu_migrate: Do not forbif vDPA devices if can query blockers

Jonathon Jongsma (1):
  qemu: introduce capability QEMU_MIGRATION_BLOCKED_REASONS

 src/qemu/qemu_capabilities.c                  |  2 +
 src/qemu/qemu_capabilities.h                  |  1 +
 src/qemu/qemu_migration.c                     | 38 ++++++++++++++++++-
 src/qemu/qemu_monitor.c                       | 11 ++++++
 src/qemu/qemu_monitor.h                       |  4 ++
 src/qemu/qemu_monitor_json.c                  | 35 +++++++++++++++++
 src/qemu/qemu_monitor_json.h                  |  3 ++
 .../caps_6.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  1 +
 .../caps_6.0.0.x86_64.xml                     |  1 +
 .../caps_6.1.0.x86_64.xml                     |  1 +
 .../caps_6.2.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  1 +
 .../caps_6.2.0.x86_64.xml                     |  1 +
 .../caps_7.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
 .../caps_7.0.0.x86_64.xml                     |  1 +
 .../caps_7.1.0.x86_64.xml                     |  1 +
 18 files changed, 104 insertions(+), 1 deletion(-)

-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 09:11:50 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 11:11:50 +0200
Subject: [libvirt PATCH v2 1/5] qemu: introduce capability
 QEMU_MIGRATION_BLOCKED_REASONS
In-Reply-To: <20220720091154.3135061-1-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
Message-ID: <20220720091154.3135061-2-eperezma@redhat.com>

From: Jonathon Jongsma <jjongsma at redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 2 ++
 src/qemu/qemu_capabilities.h                      | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
 13 files changed, 14 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 30b396d32d..b002fb98ed 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -672,6 +672,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
               "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
+              "migration.blocked-reasons", /* QEMU_CAPS_MIGRATION_BLOCKED_REASONS */
     );
 
 
@@ -1622,6 +1623,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU_VDAGENT },
     { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS },
     { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX },
+    { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKED_REASONS },
 };
 
 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d979a5ba3b..8f3090e2ce 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -651,6 +651,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
     QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
+    QEMU_CAPS_MIGRATION_BLOCKED_REASONS, /* query-migrate returns 'blocked-reasons */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 01e30f4e02..4afd7b26ce 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -187,6 +187,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index aa7b5deab5..c9cb85daa0 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -144,6 +144,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index d9e385ab1d..508804521c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -229,6 +229,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 05f297dfa2..d4a540fafd 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -234,6 +234,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 9cb1a32354..71697fac95 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -199,6 +199,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 5df148d787..3f86e03f18 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -193,6 +193,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index dd011f8408..1a1a9643d4 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -236,6 +236,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 39a5cd154d..a3991e9853 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -207,6 +207,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 6e872f4f85..67dff32f50 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -211,6 +211,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index a8f46df1cd..8ce423557e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -241,6 +241,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 8464909698..2b2f1aef52 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -242,6 +242,7 @@
   <flag name='display-dbus'/>
   <flag name='iothread.thread-pool-max'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 09:11:51 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 11:11:51 +0200
Subject: [libvirt PATCH v2 2/5] qemu_monitor_json: Add
 qemuMonitorJSONGetMigrationBlockers
In-Reply-To: <20220720091154.3135061-1-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
Message-ID: <20220720091154.3135061-3-eperezma@redhat.com>

This will allow qemuMigrationSrcIsAllowed to dynamically ask for
migration blockers, reducing duplication.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
 src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |  3 +++
 2 files changed, 38 insertions(+)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 5e4a86e5ad..a53d721720 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3338,6 +3338,41 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
     return 0;
 }
 
+int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
+                                        char ***blockers)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    virJSONValue *data;
+    virJSONValue *jblockers;
+    size_t i;
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
+        return -1;
+
+    data = virJSONValueObjectGetObject(reply, "return");
+
+    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
+        return -1;
+
+    /* NULL terminated array */
+    *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1);
+    for (i = 0; i < virJSONValueArraySize(jblockers); i++) {
+        virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i);
+        const char *blocker = virJSONValueGetString(jblocker);
+
+        (*blockers)[i] = g_strdup(blocker);
+    }
+
+    return 0;
+}
+
 int qemuMonitorJSONMigrateCancel(qemuMonitor *mon)
 {
     g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL);
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 2759566892..e4c65e250e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -184,6 +184,9 @@ qemuMonitorJSONMigrate(qemuMonitor *mon,
                        unsigned int flags,
                        const char *uri);
 int
+qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
+                                    char ***blockers);
+int
 qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon,
                                        bool *spice_migrated);
 
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 09:11:52 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 11:11:52 +0200
Subject: [libvirt PATCH v2 3/5] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <20220720091154.3135061-1-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
Message-ID: <20220720091154.3135061-4-eperezma@redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Enable qemu monitor to send this query.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
 src/qemu/qemu_monitor.c | 11 +++++++++++
 src/qemu/qemu_monitor.h |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 109107eaae..e0939beecd 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4486,3 +4486,14 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONMigrateRecover(mon, uri);
 }
+
+int
+qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
+                                char ***blockers)
+{
+    VIR_DEBUG("blockers=%p", blockers);
+
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONGetMigrationBlockers(mon, blockers);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index cc1a0bc8c9..b82f198285 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1543,3 +1543,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorMigrateRecover(qemuMonitor *mon,
                           const char *uri);
+
+int
+qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
+                                char ***blockers);
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 09:11:53 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 11:11:53 +0200
Subject: [libvirt PATCH v2 4/5] qemu_migration: get migration blockers before
 hardcoded checks
In-Reply-To: <20220720091154.3135061-1-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
Message-ID: <20220720091154.3135061-5-eperezma@redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Enable qemuMigrationSrcIsAllowed to query it.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
 src/qemu/qemu_migration.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b12cb518ee..4224339f39 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
     return true;
 }
 
+static int
+qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
+                               virDomainObj *vm,
+                               char ***blockers)
+{
+    qemuDomainObjPrivate *priv = vm->privateData;
+    int rc;
+
+    qemuDomainObjEnterMonitor(driver, vm);
+    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
+    qemuDomainObjExitMonitor(vm);
+
+    return rc;
+}
 
 /**
  * qemuMigrationSrcIsAllowed:
@@ -1439,6 +1453,25 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int nsnapshots;
     int pauseReason;
     size_t i;
+    int r;
+
+    /* Ask qemu if it have a migration blocker */
+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
+        g_auto(GStrv) blockers = NULL;
+        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
+        if (r != 0) {
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           _("cannot migrate domain, %s"),
+                           _("error getting blockers"));
+            return false;
+        }
+
+        if (blockers[0]) {
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           _("cannot migrate domain, %s"), blockers[0]);
+            return false;
+        }
+    }
 
     /* perform these checks only when migrating to remote hosts */
     if (remote) {
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 09:11:54 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 11:11:54 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices if
 can query blockers
In-Reply-To: <20220720091154.3135061-1-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
Message-ID: <20220720091154.3135061-6-eperezma@redhat.com>

vDPA devices will be migratable soon. Since they are not migratable
before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
for migration blockers, let it hardcoded in that case.

Otherwise, ask qemu about the explicit blocker.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
 src/qemu/qemu_migration.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 4224339f39..2f5c1d8121 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int pauseReason;
     size_t i;
     int r;
+    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
+                                          QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
 
     /* Ask qemu if it have a migration blocker */
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
+    if (blockedReasonsCap) {
         g_auto(GStrv) blockers = NULL;
         r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
         if (r != 0) {
@@ -1579,7 +1581,8 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
             virDomainNetDef *net = vm->def->nets[i];
             qemuSlirp *slirp;
 
-            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
+
+            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
                 virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                                _("vDPA devices cannot be migrated"));
                 return false;
-- 
2.31.1


From mprivozn at redhat.com  Wed Jul 20 10:04:08 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 12:04:08 +0200
Subject: [PATCH 2/2] schemas: Drop <interleave/> from capabilities schemas
In-Reply-To: <Yte/5zxtH015P9h/@redhat.com>
References: <cover.1658298964.git.mprivozn@redhat.com>
 <9a597c62f6baf4f423a8907fb16cfade416d5852.1658298964.git.mprivozn@redhat.com>
 <Yte/5zxtH015P9h/@redhat.com>
Message-ID: <3633c65b-8dd9-29d6-da06-22b12056a4e4@redhat.com>

On 7/20/22 10:42, Daniel P. Berrang? wrote:
> On Wed, Jul 20, 2022 at 08:36:29AM +0200, Michal Privoznik wrote:
>> Currently, we have two types of output only XMLs: capabilities
>> and domaincapabilities. Neither of these is ever parsed.
>> Moreover, the order of elements inside these two documents is
>> well defined by their respective format functions. Therefore,
>> there's no need to have <interleave/> anywhere in their
>> corresponding schemas.
> 
> The consumers of libvirt need to parse the XML, and they may wish
> to use the RNG files to validate. If the libvirt XML formatter has
> ever, or will ever, change ordering of elements, our RNG should
> be prepared for that. IOW, we should consider the RNG to be something
> that must validate XML output by all previous versions of libvirt.

Well, that's a very strong requirement that we don't even have for
domain XML. I though that using RNG from corresponding libvirt release
is recommended.

> How confident can we be that we've never changed the order of
> any elements ?  IMHO its best practice to always use <interleave/>

We're currently only halfway there. Some elements are allowed to
interleave, some aren't. But okay, let's drop my patches and if we ever
decide to change ordering we'll have domaincapstest, well virschematest
shouting at us.

Michal


From jdenemar at redhat.com  Wed Jul 20 10:14:34 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 12:14:34 +0200
Subject: [libvirt PATCH v2 2/5] qemu_monitor_json: Add
 qemuMonitorJSONGetMigrationBlockers
In-Reply-To: <20220720091154.3135061-3-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-3-eperezma@redhat.com>
Message-ID: <YtfVimkChXbP+yOw@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 11:11:51 +0200, Eugenio P?rez wrote:
> This will allow qemuMigrationSrcIsAllowed to dynamically ask for
> migration blockers, reducing duplication.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
>  src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++++++++++
>  src/qemu/qemu_monitor_json.h |  3 +++
>  2 files changed, 38 insertions(+)
> 
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 5e4a86e5ad..a53d721720 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -3338,6 +3338,41 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
>      return 0;
>  }
>  
> +int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
> +                                        char ***blockers)
> +{
> +    g_autoptr(virJSONValue) cmd = NULL;
> +    g_autoptr(virJSONValue) reply = NULL;
> +    virJSONValue *data;
> +    virJSONValue *jblockers;
> +    size_t i;
> +
> +    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
> +        return -1;

We already have a function which calls query-migrate in JSON monitor,
but I actually agree with adding this separate function as it serves a
completely different purpose.

> +
> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> +        return -1;
> +
> +    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
> +        return -1;
> +
> +    data = virJSONValueObjectGetObject(reply, "return");
> +
> +    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
> +        return -1;

This is not an error (not to mention that you would return -1 without a
proper error message) as missing blocked-reasons means there's no
migration blocker and the domain can be migrated (as long as the
QEMU_CAPS_MIGRATION_BLOCKED_REASONS capability is set).

I think we should return 0 and set *blockers = NULL in this case.

> +
> +    /* NULL terminated array */

This comment would be better as part of a proper documentation above the
function.

> +    *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1);
> +    for (i = 0; i < virJSONValueArraySize(jblockers); i++) {
> +        virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i);
> +        const char *blocker = virJSONValueGetString(jblocker);
> +
> +        (*blockers)[i] = g_strdup(blocker);
> +    }
> +
> +    return 0;
> +}
> +
>  int qemuMonitorJSONMigrateCancel(qemuMonitor *mon)
>  {
>      g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL);

Jirka

From jdenemar at redhat.com  Wed Jul 20 10:15:22 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 12:15:22 +0200
Subject: [libvirt PATCH v2 1/5] qemu: introduce capability
 QEMU_MIGRATION_BLOCKED_REASONS
In-Reply-To: <20220720091154.3135061-2-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-2-eperezma@redhat.com>
Message-ID: <YtfVuktaQNiAsn1I@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 11:11:50 +0200, Eugenio P?rez wrote:
> From: Jonathon Jongsma <jjongsma at redhat.com>
> 
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>

s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/ in
the subject.

Jirka

From jdenemar at redhat.com  Wed Jul 20 10:16:00 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 12:16:00 +0200
Subject: [libvirt PATCH v2 3/5] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <20220720091154.3135061-4-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-4-eperezma@redhat.com>
Message-ID: <YtfV4PI6Ue6gS8bF@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 11:11:52 +0200, Eugenio P?rez wrote:
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Enable qemu monitor to send this query.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
>  src/qemu/qemu_monitor.c | 11 +++++++++++
>  src/qemu/qemu_monitor.h |  4 ++++
>  2 files changed, 15 insertions(+)

You can just squash this into the previous patch.

Jirka

From jdenemar at redhat.com  Wed Jul 20 10:31:28 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 12:31:28 +0200
Subject: [libvirt PATCH v2 4/5] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <20220720091154.3135061-5-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-5-eperezma@redhat.com>
Message-ID: <YtfZgOlSktgfcSKR@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 11:11:53 +0200, Eugenio P?rez wrote:
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Enable qemuMigrationSrcIsAllowed to query it.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 33 +++++++++++++++++++++++++++++++++
>  1 file changed, 33 insertions(+)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index b12cb518ee..4224339f39 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
>      return true;
>  }
>  
> +static int
> +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> +                               virDomainObj *vm,
> +                               char ***blockers)
> +{
> +    qemuDomainObjPrivate *priv = vm->privateData;
> +    int rc;
> +
> +    qemuDomainObjEnterMonitor(driver, vm);
> +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> +    qemuDomainObjExitMonitor(vm);
> +
> +    return rc;
> +}
>  
>  /**
>   * qemuMigrationSrcIsAllowed:
> @@ -1439,6 +1453,25 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>      int nsnapshots;
>      int pauseReason;
>      size_t i;
> +    int r;
> +
> +    /* Ask qemu if it have a migration blocker */
> +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> +        g_auto(GStrv) blockers = NULL;
> +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> +        if (r != 0) {
> +            virReportError(VIR_ERR_OPERATION_INVALID,
> +                           _("cannot migrate domain, %s"),
> +                           _("error getting blockers"));

If qemuDomainGetMigrationBlockers returned -1 a better error message
should already be set and you would overwrite it here. Also with your
current patch you would report this error even in case there was no
migration blocker reported by QEMU. But this part would be fixed by
letting qemuDomainGetMigrationBlockers return 0 when the blocked-reasons
field is missing.

> +            return false;
> +        }
> +
> +        if (blockers[0]) {

blockers && blockers[0]

> +            virReportError(VIR_ERR_OPERATION_INVALID,
> +                           _("cannot migrate domain, %s"), blockers[0]);

I would prefer a colon there: "cannot migrate domain: %s". And we got a
list of blockers from QEMU, but only use the first one? Please, join
them with g_strjoinv().

> +            return false;
> +        }
> +    }
>  
>      /* perform these checks only when migrating to remote hosts */
>      if (remote) {

Jirka

From jdenemar at redhat.com  Wed Jul 20 10:36:16 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 12:36:16 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <20220720091154.3135061-6-eperezma@redhat.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
Message-ID: <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> vDPA devices will be migratable soon. Since they are not migratable
> before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> for migration blockers, let it hardcoded in that case.
> 
> Otherwise, ask qemu about the explicit blocker.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 4224339f39..2f5c1d8121 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>      int pauseReason;
>      size_t i;
>      int r;
> +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> +                                          QEMU_CAPS_MIGRATION_BLOCKED_REASONS);

Wrong indentation of the second line (QEMU... should be aligned with
priv).

>  
>      /* Ask qemu if it have a migration blocker */
> -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> +    if (blockedReasonsCap) {
>          g_auto(GStrv) blockers = NULL;
>          r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
>          if (r != 0) {
> @@ -1579,7 +1581,8 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>              virDomainNetDef *net = vm->def->nets[i];
>              qemuSlirp *slirp;
>  
> -            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
> +

Extra empty line.

> +            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {

So possibly we could skip more checks in the function if migration
blockers are supported by QEMU, but this is a good conservative
approach. The other checks (if any) can be taken care of separately.

>                  virReportError(VIR_ERR_OPERATION_INVALID, "%s",
>                                 _("vDPA devices cannot be migrated"));
>                  return false;

Jirka

From jdenemar at redhat.com  Wed Jul 20 10:37:19 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 12:37:19 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
 <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
Message-ID: <Ytfa33QVVbKDXSyw@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 12:36:16 +0200, Jiri Denemark wrote:
> On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> > vDPA devices will be migratable soon. Since they are not migratable
> > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > for migration blockers, let it hardcoded in that case.
> > 
> > Otherwise, ask qemu about the explicit blocker.
> > 
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> >  src/qemu/qemu_migration.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)

Oh and I forgot to mention s/qemu_migrate/qemu_migration/ in the
subject.

Jirka

From eperezma at redhat.com  Wed Jul 20 10:43:44 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 12:43:44 +0200
Subject: [libvirt PATCH v2 2/5] qemu_monitor_json: Add
 qemuMonitorJSONGetMigrationBlockers
In-Reply-To: <YtfVimkChXbP+yOw@orkuz.int.mamuti.net>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-3-eperezma@redhat.com>
 <YtfVimkChXbP+yOw@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWdpUAeOvujvfJ4pxLbTnnRvmVMTQvCqfQRPa3w4ypo5iA@mail.gmail.com>

On Wed, Jul 20, 2022 at 12:14 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 11:11:51 +0200, Eugenio P?rez wrote:
> > This will allow qemuMigrationSrcIsAllowed to dynamically ask for
> > migration blockers, reducing duplication.
> >
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> >  src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++++++++++
> >  src/qemu/qemu_monitor_json.h |  3 +++
> >  2 files changed, 38 insertions(+)
> >
> > diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> > index 5e4a86e5ad..a53d721720 100644
> > --- a/src/qemu/qemu_monitor_json.c
> > +++ b/src/qemu/qemu_monitor_json.c
> > @@ -3338,6 +3338,41 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
> >      return 0;
> >  }
> >
> > +int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
> > +                                        char ***blockers)
> > +{
> > +    g_autoptr(virJSONValue) cmd = NULL;
> > +    g_autoptr(virJSONValue) reply = NULL;
> > +    virJSONValue *data;
> > +    virJSONValue *jblockers;
> > +    size_t i;
> > +
> > +    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
> > +        return -1;
>
> We already have a function which calls query-migrate in JSON monitor,
> but I actually agree with adding this separate function as it serves a
> completely different purpose.
>

I'm totally ok if anybody prefers to merge both too.

> > +
> > +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> > +        return -1;
> > +
> > +    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
> > +        return -1;
> > +
> > +    data = virJSONValueObjectGetObject(reply, "return");
> > +
> > +    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
> > +        return -1;
>
> This is not an error (not to mention that you would return -1 without a
> proper error message) as missing blocked-reasons means there's no
> migration blocker and the domain can be migrated (as long as the
> QEMU_CAPS_MIGRATION_BLOCKED_REASONS capability is set).
>

Right, I'll fix it.

Regarding the message on failure, a lot of the functions in this file
returns -1 without a message. How can I print it properly here or
propagate to the caller?

> I think we should return 0 and set *blockers = NULL in this case.
>

Sure, I'll change that.

> > +
> > +    /* NULL terminated array */
>
> This comment would be better as part of a proper documentation above the
> function.
>

I'll move to the function doc.

Thanks!



> > +    *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1);
> > +    for (i = 0; i < virJSONValueArraySize(jblockers); i++) {
> > +        virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i);
> > +        const char *blocker = virJSONValueGetString(jblocker);
> > +
> > +        (*blockers)[i] = g_strdup(blocker);
> > +    }
> > +
> > +    return 0;
> > +}
> > +
> >  int qemuMonitorJSONMigrateCancel(qemuMonitor *mon)
> >  {
> >      g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL);
>
> Jirka
>


From eperezma at redhat.com  Wed Jul 20 11:10:48 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 13:10:48 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <Ytfa33QVVbKDXSyw@orkuz.int.mamuti.net>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
 <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
 <Ytfa33QVVbKDXSyw@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWcHcDTD4-0PpKWU4r1wNzBsUEPT7=H896qr6vPjAidiGw@mail.gmail.com>

On Wed, Jul 20, 2022 at 12:37 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 12:36:16 +0200, Jiri Denemark wrote:
> > On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> > > vDPA devices will be migratable soon. Since they are not migratable
> > > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > > for migration blockers, let it hardcoded in that case.
> > >
> > > Otherwise, ask qemu about the explicit blocker.
> > >
> > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > ---
> > >  src/qemu/qemu_migration.c | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
>
> Oh and I forgot to mention s/qemu_migrate/qemu_migration/ in the
> subject.
>

I'll fix it in the next version.

Thanks!

> Jirka
>


From eperezma at redhat.com  Wed Jul 20 11:11:57 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 13:11:57 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
 <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWfdB7ivgt43nC+ytKdb4d792FKiaMuya1xVGdBhR903Bw@mail.gmail.com>

On Wed, Jul 20, 2022 at 12:36 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> > vDPA devices will be migratable soon. Since they are not migratable
> > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > for migration blockers, let it hardcoded in that case.
> >
> > Otherwise, ask qemu about the explicit blocker.
> >
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> >  src/qemu/qemu_migration.c | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > index 4224339f39..2f5c1d8121 100644
> > --- a/src/qemu/qemu_migration.c
> > +++ b/src/qemu/qemu_migration.c
> > @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >      int pauseReason;
> >      size_t i;
> >      int r;
> > +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> > +                                          QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
>
> Wrong indentation of the second line (QEMU... should be aligned with
> priv).
>

I'm fine with that indentation, but that will be a line with more than 80 chars.

> >
> >      /* Ask qemu if it have a migration blocker */
> > -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > +    if (blockedReasonsCap) {
> >          g_auto(GStrv) blockers = NULL;
> >          r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> >          if (r != 0) {
> > @@ -1579,7 +1581,8 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >              virDomainNetDef *net = vm->def->nets[i];
> >              qemuSlirp *slirp;
> >
> > -            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
> > +
>
> Extra empty line.
>

I'll delete it in the next version.

> > +            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
>
> So possibly we could skip more checks in the function if migration
> blockers are supported by QEMU, but this is a good conservative
> approach. The other checks (if any) can be taken care of separately.
>

I did a fast search but I didn't see something super obvious to me.

Thanks!

> >                  virReportError(VIR_ERR_OPERATION_INVALID, "%s",
> >                                 _("vDPA devices cannot be migrated"));
> >                  return false;
>
> Jirka
>


From jdenemar at redhat.com  Wed Jul 20 11:13:16 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 13:13:16 +0200
Subject: [libvirt PATCH v2 2/5] qemu_monitor_json: Add
 qemuMonitorJSONGetMigrationBlockers
In-Reply-To: <CAJaqyWdpUAeOvujvfJ4pxLbTnnRvmVMTQvCqfQRPa3w4ypo5iA@mail.gmail.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-3-eperezma@redhat.com>
 <YtfVimkChXbP+yOw@orkuz.int.mamuti.net>
 <CAJaqyWdpUAeOvujvfJ4pxLbTnnRvmVMTQvCqfQRPa3w4ypo5iA@mail.gmail.com>
Message-ID: <YtfjTPjX3Fn11ZXL@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 12:43:44 +0200, Eugenio Perez Martin wrote:
> On Wed, Jul 20, 2022 at 12:14 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> >
> > On Wed, Jul 20, 2022 at 11:11:51 +0200, Eugenio P?rez wrote:
> > > This will allow qemuMigrationSrcIsAllowed to dynamically ask for
> > > migration blockers, reducing duplication.
> > >
> > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > ---
> > >  src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++++++++++
> > >  src/qemu/qemu_monitor_json.h |  3 +++
> > >  2 files changed, 38 insertions(+)
> > >
> > > diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> > > index 5e4a86e5ad..a53d721720 100644
> > > --- a/src/qemu/qemu_monitor_json.c
> > > +++ b/src/qemu/qemu_monitor_json.c
> > > @@ -3338,6 +3338,41 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
> > >      return 0;
> > >  }
> > >
> > > +int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
> > > +                                        char ***blockers)
> > > +{
> > > +    g_autoptr(virJSONValue) cmd = NULL;
> > > +    g_autoptr(virJSONValue) reply = NULL;
> > > +    virJSONValue *data;
> > > +    virJSONValue *jblockers;
> > > +    size_t i;
> > > +
> > > +    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
> > > +        return -1;
> >
> > We already have a function which calls query-migrate in JSON monitor,
> > but I actually agree with adding this separate function as it serves a
> > completely different purpose.
> >
> 
> I'm totally ok if anybody prefers to merge both too.

I don't think anyone would prefer that as the existing function is a big
beast which would get even more complicated if generalized for this use
case.

> > > +
> > > +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> > > +        return -1;
> > > +
> > > +    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
> > > +        return -1;
> > > +
> > > +    data = virJSONValueObjectGetObject(reply, "return");
> > > +
> > > +    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
> > > +        return -1;
> >
> > This is not an error (not to mention that you would return -1 without a
> > proper error message) as missing blocked-reasons means there's no
> > migration blocker and the domain can be migrated (as long as the
> > QEMU_CAPS_MIGRATION_BLOCKED_REASONS capability is set).
> >
> 
> Right, I'll fix it.
> 
> Regarding the message on failure, a lot of the functions in this file
> returns -1 without a message. How can I print it properly here or
> propagate to the caller?

Well, returning -1 is fine if the function called
(qemuMonitorJSONCommand, qemuMonitorJSONCheckReply) already reports an
error. But this is not the case of virJSONValueObjectGetArray. Reporting
an error would be done just by calling virReportError() here instead of
having it in the caller. Anyway, nothing to worry about here as you
will be returning 0.

Jirka

From pkrempa at redhat.com  Wed Jul 20 11:13:52 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 20 Jul 2022 13:13:52 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <CAJaqyWfdB7ivgt43nC+ytKdb4d792FKiaMuya1xVGdBhR903Bw@mail.gmail.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
 <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
 <CAJaqyWfdB7ivgt43nC+ytKdb4d792FKiaMuya1xVGdBhR903Bw@mail.gmail.com>
Message-ID: <YtfjcFpFuTKs9SWn@angien.pipo.sk>

On Wed, Jul 20, 2022 at 13:11:57 +0200, Eugenio Perez Martin wrote:
> On Wed, Jul 20, 2022 at 12:36 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> >
> > On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> > > vDPA devices will be migratable soon. Since they are not migratable
> > > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > > for migration blockers, let it hardcoded in that case.
> > >
> > > Otherwise, ask qemu about the explicit blocker.
> > >
> > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > ---
> > >  src/qemu/qemu_migration.c | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > index 4224339f39..2f5c1d8121 100644
> > > --- a/src/qemu/qemu_migration.c
> > > +++ b/src/qemu/qemu_migration.c
> > > @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> > >      int pauseReason;
> > >      size_t i;
> > >      int r;
> > > +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> > > +                                          QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
> >
> > Wrong indentation of the second line (QEMU... should be aligned with
> > priv).
> >
> 
> I'm fine with that indentation, but that will be a line with more than 80 chars.

The max 80 columns limitation is only a soft limit. We prefer way more
to keep alignment and readability of the code rather than stick to the
antiquated 80 columns limit. 

From eperezma at redhat.com  Wed Jul 20 11:14:52 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 13:14:52 +0200
Subject: [libvirt PATCH v2 2/5] qemu_monitor_json: Add
 qemuMonitorJSONGetMigrationBlockers
In-Reply-To: <YtfjTPjX3Fn11ZXL@orkuz.int.mamuti.net>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-3-eperezma@redhat.com>
 <YtfVimkChXbP+yOw@orkuz.int.mamuti.net>
 <CAJaqyWdpUAeOvujvfJ4pxLbTnnRvmVMTQvCqfQRPa3w4ypo5iA@mail.gmail.com>
 <YtfjTPjX3Fn11ZXL@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWe3bE1-NhC1YWdjw2LP2m8Ha=sG3Vz=c_owT+NxAhBvGA@mail.gmail.com>

On Wed, Jul 20, 2022 at 1:13 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 12:43:44 +0200, Eugenio Perez Martin wrote:
> > On Wed, Jul 20, 2022 at 12:14 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> > >
> > > On Wed, Jul 20, 2022 at 11:11:51 +0200, Eugenio P?rez wrote:
> > > > This will allow qemuMigrationSrcIsAllowed to dynamically ask for
> > > > migration blockers, reducing duplication.
> > > >
> > > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > > ---
> > > >  src/qemu/qemu_monitor_json.c | 35 +++++++++++++++++++++++++++++++++++
> > > >  src/qemu/qemu_monitor_json.h |  3 +++
> > > >  2 files changed, 38 insertions(+)
> > > >
> > > > diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> > > > index 5e4a86e5ad..a53d721720 100644
> > > > --- a/src/qemu/qemu_monitor_json.c
> > > > +++ b/src/qemu/qemu_monitor_json.c
> > > > @@ -3338,6 +3338,41 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
> > > >      return 0;
> > > >  }
> > > >
> > > > +int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
> > > > +                                        char ***blockers)
> > > > +{
> > > > +    g_autoptr(virJSONValue) cmd = NULL;
> > > > +    g_autoptr(virJSONValue) reply = NULL;
> > > > +    virJSONValue *data;
> > > > +    virJSONValue *jblockers;
> > > > +    size_t i;
> > > > +
> > > > +    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
> > > > +        return -1;
> > >
> > > We already have a function which calls query-migrate in JSON monitor,
> > > but I actually agree with adding this separate function as it serves a
> > > completely different purpose.
> > >
> >
> > I'm totally ok if anybody prefers to merge both too.
>
> I don't think anyone would prefer that as the existing function is a big
> beast which would get even more complicated if generalized for this use
> case.
>
> > > > +
> > > > +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> > > > +        return -1;
> > > > +
> > > > +    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
> > > > +        return -1;
> > > > +
> > > > +    data = virJSONValueObjectGetObject(reply, "return");
> > > > +
> > > > +    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
> > > > +        return -1;
> > >
> > > This is not an error (not to mention that you would return -1 without a
> > > proper error message) as missing blocked-reasons means there's no
> > > migration blocker and the domain can be migrated (as long as the
> > > QEMU_CAPS_MIGRATION_BLOCKED_REASONS capability is set).
> > >
> >
> > Right, I'll fix it.
> >
> > Regarding the message on failure, a lot of the functions in this file
> > returns -1 without a message. How can I print it properly here or
> > propagate to the caller?
>
> Well, returning -1 is fine if the function called
> (qemuMonitorJSONCommand, qemuMonitorJSONCheckReply) already reports an
> error. But this is not the case of virJSONValueObjectGetArray. Reporting
> an error would be done just by calling virReportError() here instead of
> having it in the caller. Anyway, nothing to worry about here as you
> will be returning 0.
>

Got it.

Thanks!

> Jirka
>


From eperezma at redhat.com  Wed Jul 20 11:15:56 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 13:15:56 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <YtfjcFpFuTKs9SWn@angien.pipo.sk>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
 <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
 <CAJaqyWfdB7ivgt43nC+ytKdb4d792FKiaMuya1xVGdBhR903Bw@mail.gmail.com>
 <YtfjcFpFuTKs9SWn@angien.pipo.sk>
Message-ID: <CAJaqyWf4NbFE7xeqRQ2Bv+L5MqVNug7R+w1OzPJBJQE98gjEDQ@mail.gmail.com>

On Wed, Jul 20, 2022 at 1:13 PM Peter Krempa <pkrempa at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 13:11:57 +0200, Eugenio Perez Martin wrote:
> > On Wed, Jul 20, 2022 at 12:36 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> > >
> > > On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> > > > vDPA devices will be migratable soon. Since they are not migratable
> > > > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > > > for migration blockers, let it hardcoded in that case.
> > > >
> > > > Otherwise, ask qemu about the explicit blocker.
> > > >
> > > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > > ---
> > > >  src/qemu/qemu_migration.c | 7 +++++--
> > > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > > index 4224339f39..2f5c1d8121 100644
> > > > --- a/src/qemu/qemu_migration.c
> > > > +++ b/src/qemu/qemu_migration.c
> > > > @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> > > >      int pauseReason;
> > > >      size_t i;
> > > >      int r;
> > > > +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> > > > +                                          QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
> > >
> > > Wrong indentation of the second line (QEMU... should be aligned with
> > > priv).
> > >
> >
> > I'm fine with that indentation, but that will be a line with more than 80 chars.
>
> The max 80 columns limitation is only a soft limit. We prefer way more
> to keep alignment and readability of the code rather than stick to the
> antiquated 80 columns limit.
>

Got it, I'll indent properly for the next version then.

Thanks!


From jdenemar at redhat.com  Wed Jul 20 11:16:57 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 13:16:57 +0200
Subject: [libvirt PATCH v2 5/5] qemu_migrate: Do not forbif vDPA devices
 if can query blockers
In-Reply-To: <CAJaqyWfdB7ivgt43nC+ytKdb4d792FKiaMuya1xVGdBhR903Bw@mail.gmail.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-6-eperezma@redhat.com>
 <YtfaoJ6Ehu3ZieIq@orkuz.int.mamuti.net>
 <CAJaqyWfdB7ivgt43nC+ytKdb4d792FKiaMuya1xVGdBhR903Bw@mail.gmail.com>
Message-ID: <YtfkKcdnmF+Jzirl@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 13:11:57 +0200, Eugenio Perez Martin wrote:
> On Wed, Jul 20, 2022 at 12:36 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> >
> > On Wed, Jul 20, 2022 at 11:11:54 +0200, Eugenio P?rez wrote:
> > > vDPA devices will be migratable soon. Since they are not migratable
> > > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > > for migration blockers, let it hardcoded in that case.
> > >
> > > Otherwise, ask qemu about the explicit blocker.
> > >
> > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > ---
> > >  src/qemu/qemu_migration.c | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > index 4224339f39..2f5c1d8121 100644
> > > --- a/src/qemu/qemu_migration.c
> > > +++ b/src/qemu/qemu_migration.c
> > > @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> > >      int pauseReason;
> > >      size_t i;
> > >      int r;
> > > +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> > > +                                          QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
> >
> > Wrong indentation of the second line (QEMU... should be aligned with
> > priv).
> >
> 
> I'm fine with that indentation, but that will be a line with more than 80 chars.

No problem, it's not a hard requirement anymore in cases where it would
make the result look worse.

Jirka

From eperezma at redhat.com  Wed Jul 20 11:25:45 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 13:25:45 +0200
Subject: [libvirt PATCH v2 4/5] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <YtfZgOlSktgfcSKR@orkuz.int.mamuti.net>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-5-eperezma@redhat.com>
 <YtfZgOlSktgfcSKR@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWcizJWDN6xb33P3op_T6gLaQfA36OK=KXT9x=OwetcPuQ@mail.gmail.com>

On Wed, Jul 20, 2022 at 12:31 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 11:11:53 +0200, Eugenio P?rez wrote:
> > since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> > will return an array of error strings describing the migration blockers.
> > This can be used to check whether there are any devices blocking
> > migration, etc.
> >
> > Enable qemuMigrationSrcIsAllowed to query it.
> >
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> >  src/qemu/qemu_migration.c | 33 +++++++++++++++++++++++++++++++++
> >  1 file changed, 33 insertions(+)
> >
> > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > index b12cb518ee..4224339f39 100644
> > --- a/src/qemu/qemu_migration.c
> > +++ b/src/qemu/qemu_migration.c
> > @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
> >      return true;
> >  }
> >
> > +static int
> > +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> > +                               virDomainObj *vm,
> > +                               char ***blockers)
> > +{
> > +    qemuDomainObjPrivate *priv = vm->privateData;
> > +    int rc;
> > +
> > +    qemuDomainObjEnterMonitor(driver, vm);
> > +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> > +    qemuDomainObjExitMonitor(vm);
> > +
> > +    return rc;
> > +}
> >
> >  /**
> >   * qemuMigrationSrcIsAllowed:
> > @@ -1439,6 +1453,25 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >      int nsnapshots;
> >      int pauseReason;
> >      size_t i;
> > +    int r;
> > +
> > +    /* Ask qemu if it have a migration blocker */
> > +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > +        g_auto(GStrv) blockers = NULL;
> > +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> > +        if (r != 0) {
> > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > +                           _("cannot migrate domain, %s"),
> > +                           _("error getting blockers"));
>
> If qemuDomainGetMigrationBlockers returned -1 a better error message
> should already be set and you would overwrite it here. Also with your
> current patch you would report this error even in case there was no
> migration blocker reported by QEMU. But this part would be fixed by
> letting qemuDomainGetMigrationBlockers return 0 when the blocked-reasons
> field is missing.
>

Got it.

> > +            return false;
> > +        }
> > +
> > +        if (blockers[0]) {
>
> blockers && blockers[0]
>
> > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > +                           _("cannot migrate domain, %s"), blockers[0]);
>
> I would prefer a colon there: "cannot migrate domain: %s". And we got a
> list of blockers from QEMU, but only use the first one? Please, join
> them with g_strjoinv().
>

So the resulting message should be:
"cannot migrate domain: <error1>, <error2>, ..., <errorN>", right?

Thanks!

> > +            return false;
> > +        }
> > +    }
> >
> >      /* perform these checks only when migrating to remote hosts */
> >      if (remote) {
>
> Jirka
>


From mprivozn at redhat.com  Wed Jul 20 11:26:40 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:40 +0200
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <20220701191446.727066-1-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
Message-ID: <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> This patch series provides support for enabling Intel's Software Guard
> Extensions (SGX) feature in guest VM.
> 

This version is a bit better than the previous one. But we're at version
13 and I am still unable to even start a guest. Please, make sure that
this basic functionality works in v14, because this is plain waste of
precious review bandwidth.

Anyway, as usual, I've uploaded my suggested fixes here:

https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx/

Michal


From mprivozn at redhat.com  Wed Jul 20 11:26:40 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:40 +0200
Subject: [libvirt][PATCH v13 6/6] qemu: Add command-line to generate SGX
 EPC memory backend
In-Reply-To: <20220701191446.727066-7-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-7-lin.a.yang@intel.com>
Message-ID: <91175158-9965-3ec7-9f38-1bc44d7ee050@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> According to the result parsing from xml, add the argument of
> SGX EPC memory backend into QEMU command line.
> 
> With NUMA config:
> 
>     #qemu-system-x86_64 \
>         ...... \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \
>         -machine sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1
> 
> Without NUMA config:
> 
>     #qemu-system-x86_64 \
>         ...... \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \
>         -machine sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1

Except, ...

> 
> Signed-off-by: Lin Yang <lin.a.yang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> ---
>  src/qemu/qemu_alias.c                         |  3 +-
>  src/qemu/qemu_command.c                       | 86 ++++++++++++++++++-
>  src/qemu/qemu_monitor_json.c                  | 41 +++++++--
>  .../sgx-epc-numa.x86_64-latest.args           | 40 +++++++++
>  .../sgx-epc.x86_64-6.2.0.args                 | 37 ++++++++
>  tests/qemuxml2argvtest.c                      |  3 +
>  6 files changed, 198 insertions(+), 12 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
> 


> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.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 \
> +/usr/bin/qemu-system-x86_64 \
> +-name guest=QEMUGuest1,debug-threads=on \
> +-S \
> +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
> +-machine q35,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1 \
> +-accel tcg \
> +-cpu qemu64 \
> +-m 214 \
> +-overcommit mem-lock=off \
> +-smp 2,sockets=2,cores=1,threads=1 \
> +-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
> +-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
> +-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
> +-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-display none \
> +-no-user-config \
> +-nodefaults \
> +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
> +-mon chardev=charmonitor,id=monitor,mode=control \
> +-rtc base=utc \
> +-no-shutdown \
> +-no-acpi \
> +-boot strict=on \
> +-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
> +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
> +-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
> +-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \

... nor here ...

> +-audiodev '{"id":"audio1","driver":"none"}' \
> +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.1","addr":"0x0"}' \
> +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
> +-msg timestamp=on
> diff --git a/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
> new file mode 100644
> index 0000000000..56c476b777
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
> @@ -0,0 +1,37 @@
> +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 \
> +/usr/bin/qemu-system-x86_64 \
> +-name guest=QEMUGuest1,debug-threads=on \
> +-S \
> +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
> +-machine pc-q35-6.2,usb=off,dump-guest-core=off,memory-backend=pc.ram,sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1 \
> +-accel tcg \
> +-cpu qemu64 \
> +-m 134 \
> +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":140509184}' \
> +-overcommit mem-lock=off \
> +-smp 1,sockets=1,cores=1,threads=1 \
> +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
> +-display none \
> +-no-user-config \
> +-nodefaults \
> +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
> +-mon chardev=charmonitor,id=monitor,mode=control \
> +-rtc base=utc \
> +-no-shutdown \
> +-no-acpi \
> +-boot strict=on \
> +-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
> +-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
> +-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
> +-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \


... nor here is epc backend generated before -machine argument which
makes QEMU fail at startup:

qemu-system-x86_64: Invalid parameter type for 'memdev', expected:
memory-backend-epc

At least I think that's the root cause.

Michal


From mprivozn at redhat.com  Wed Jul 20 11:26:44 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:44 +0200
Subject: [libvirt][PATCH v13 5/6] conf: Introduce SGX EPC element into
 device memory xml
In-Reply-To: <20220701191446.727066-6-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-6-lin.a.yang@intel.com>
Message-ID: <67e8ffe5-d51f-bf9a-1949-88a03e042197@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> With NUMA config:
> 
> <devices>
>   ...
>   <memory model='sgx-epc'>
>     <source>
>       <nodemask>0-1</nodemask>
>     </source>
>     <target>
>       <size unit='KiB'>512</size>
>       <node>0</node>
>     </target>
>   </memory>
>   ...
> </devices>
> 
> Without NUMA config:
> 
> <devices>
>   ...
>   <memory model='sgx-epc'>
>     <target>
>       <size unit='KiB'>512</size>
>     </target>
>   </memory>
>   ...
> </devices>
> 
> Signed-off-by: Lin Yang <lin.a.yang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  docs/formatdomain.rst                         | 27 +++++++-
>  src/conf/domain_conf.c                        | 27 ++++++++
>  src/conf/domain_conf.h                        |  1 +
>  src/conf/domain_validate.c                    |  9 +++
>  src/conf/schemas/domaincommon.rng             |  1 +
>  src/qemu/qemu_alias.c                         |  3 +
>  src/qemu/qemu_command.c                       |  1 +
>  src/qemu/qemu_domain.c                        | 48 ++++++++++----
>  src/qemu/qemu_domain_address.c                |  6 ++
>  src/qemu/qemu_driver.c                        |  1 +
>  src/qemu/qemu_process.c                       |  2 +
>  src/qemu/qemu_validate.c                      |  8 +++
>  src/security/security_apparmor.c              |  1 +
>  src/security/security_dac.c                   |  2 +
>  src/security/security_selinux.c               |  2 +
>  tests/qemuxml2argvdata/sgx-epc-numa.xml       | 50 +++++++++++++++
>  tests/qemuxml2argvdata/sgx-epc.xml            | 36 +++++++++++
>  .../sgx-epc-numa.x86_64-latest.xml            | 64 +++++++++++++++++++
>  .../sgx-epc.x86_64-6.2.0.xml                  | 52 +++++++++++++++
>  tests/qemuxml2xmltest.c                       |  3 +
>  20 files changed, 329 insertions(+), 15 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml
>  create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml
>  create mode 100644 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml
> 
> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
> index 62a94890f0..b95c930d73 100644
> --- a/docs/formatdomain.rst
> +++ b/docs/formatdomain.rst
> @@ -7910,6 +7910,20 @@ Example: usage of the memory devices
>           <current unit='KiB'>524288</current>
>         </target>
>       </memory>
> +     <memory model='sgx-epc'>
> +       <source>
> +         <nodemask>0-1</nodemask>
> +       </source>
> +       <target>
> +         <size unit='KiB'>16384</size>
> +         <node>0</node>
> +       </target>
> +     </memory>
> +     <memory model='sgx-epc'>
> +       <target>
> +         <size unit='KiB'>16384</size>
> +       </target>
> +     </memory>
>     </devices>
>     ...
>  
> @@ -7918,7 +7932,9 @@ Example: usage of the memory devices
>     1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.
>     :since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized
>     persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model
> -   to add paravirtualized memory device. :since:`Since 7.9.0`
> +   to add paravirtualized memory device. :since:`Since 7.9.0` Provide
> +   ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.
> +   :since:`Since 8.6.0 and QEMU 6.2.0`
>  
>  ``access``
>     An optional attribute ``access`` ( :since:`since 3.2.0` ) that provides
> @@ -7978,6 +7994,13 @@ Example: usage of the memory devices
>       Represents a path in the host that backs the virtio memory module in the
>       guest. It is mandatory.
>  
> +   For model ``sgx-epc`` this element is optional. The following optional
> +   elements may be used:
> +
> +   ``nodemask``
> +      This element can be used to override the default set of NUMA nodes where
> +      the memory would be allocated. :since:`Since 8.6.0 and QEMU 7.0.0`
> +
>  ``target``
>     The mandatory ``target`` element configures the placement and sizing of the
>     added memory from the perspective of the guest.
> @@ -7988,6 +8011,8 @@ Example: usage of the memory devices
>  
>     The ``node`` subelement configures the guest NUMA node to attach the memory
>     to. The element shall be used only if the guest has NUMA nodes configured.
> +   For model ``sgx-epc`` this element is optional.

This looks redudnand. The sentence right before suggests that the
element is optional.

> It will be set to 0 as
> +   default. :since:`Since 8.6.0 and QEMU 7.0.0`

This is a bit misleading as we don't report this back in the domain XML.
If you really want to document the default then say it's hypervisor
dependant. But I'd just leave these two sentences out.

>  
>     The following optional elements may be used:
>  
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 709ca53790..f8b67eb375 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -1431,6 +1431,7 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
>                "nvdimm",
>                "virtio-pmem",
>                "virtio-mem",
> +              "sgx-epc",
>  );
>  
>  VIR_ENUM_IMPL(virDomainShmemModel,
> @@ -5680,6 +5681,7 @@ virDomainMemoryDefPostParse(virDomainMemoryDef *mem,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> @@ -14697,6 +14699,20 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
>          def->nvdimmPath = virXPathString("string(./path)", ctxt);
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if ((nodemask = virXPathString("string(./nodemask)", ctxt))) {
> +            if (virBitmapParse(nodemask, &def->sourceNodes,
> +                               VIR_DOMAIN_CPUMASK_LEN) < 0)
> +                return -1;
> +
> +            if (virBitmapIsAllClear(def->sourceNodes)) {
> +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                               _("Invalid value of 'nodemask': %s"), nodemask);
> +                return -1;
> +            }
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> @@ -14765,6 +14781,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
>      }
> @@ -16561,6 +16578,7 @@ virDomainMemoryFindByDefInternal(virDomainDef *def,
>                  continue;
>              break;
>  
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
> @@ -26153,6 +26171,15 @@ virDomainMemorySourceDefFormat(virBuffer *buf,
>          virBufferEscapeString(&childBuf, "<path>%s</path>\n", def->nvdimmPath);
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if (def->sourceNodes) {
> +            if (!(bitmap = virBitmapFormat(def->sourceNodes)))
> +                return -1;
> +
> +            virBufferAsprintf(&childBuf, "<nodemask>%s</nodemask>\n", bitmap);
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
> index 4c8c42b7eb..a15798463c 100644
> --- a/src/conf/domain_conf.h
> +++ b/src/conf/domain_conf.h
> @@ -2559,6 +2559,7 @@ typedef enum {
>      VIR_DOMAIN_MEMORY_MODEL_NVDIMM, /* nvdimm memory device */
>      VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM, /* virtio-pmem memory device */
>      VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM, /* virtio-mem memory device */
> +    VIR_DOMAIN_MEMORY_MODEL_SGX_EPC, /* SGX enclave page cache */
>  
>      VIR_DOMAIN_MEMORY_MODEL_LAST
>  } virDomainMemoryModel;
> diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
> index 28b0481d4e..c8f03cb844 100644
> --- a/src/conf/domain_validate.c
> +++ b/src/conf/domain_validate.c
> @@ -2231,6 +2231,15 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if (mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
> +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                           _("memory device address is not supported for model '%s'"),
> +                           virDomainMemoryModelTypeToString(mem->model));
> +            return -1;
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      default:
> diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
> index da2fb0d5cb..c6377b2e90 100644
> --- a/src/conf/schemas/domaincommon.rng
> +++ b/src/conf/schemas/domaincommon.rng
> @@ -6833,6 +6833,7 @@
>            <value>nvdimm</value>
>            <value>virtio-pmem</value>
>            <value>virtio-mem</value>
> +          <value>sgx-epc</value>
>          </choice>
>        </attribute>
>        <optional>
> diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
> index 7efd91051e..5ebeb82f92 100644
> --- a/src/qemu/qemu_alias.c
> +++ b/src/qemu/qemu_alias.c
> @@ -515,6 +515,9 @@ qemuAssignDeviceMemoryAlias(virDomainDef *def,
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
>          prefix = "virtiomem";
>          break;
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        prefix = "epc";
> +        break;
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      default:
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index b307d3139c..7ca183ded7 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -4010,6 +4010,7 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg,
>              return NULL;
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      default:
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 60ed358871..fc64a5ca9c 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -8448,6 +8448,7 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driver,
>              break;
>  
>          case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
> @@ -9129,6 +9130,12 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
>          }
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                       _("hotplug is not supported for the %s device"),
> +                       virDomainMemoryModelTypeToString(mem->model));
> +            return -1;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          return -1;
> @@ -9164,7 +9171,7 @@ int
>  qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
>                                     const virDomainMemoryDef *mem)
>  {
> -    unsigned int nmems = def->nmems;
> +    unsigned int hotplugNum = 0;
>      unsigned long long hotplugSpace;
>      unsigned long long hotplugMemory = 0;
>      size_t i;
> @@ -9172,15 +9179,37 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
>      hotplugSpace = def->mem.max_memory - virDomainDefGetMemoryInitial(def);
>  
>      if (mem) {
> -        nmems++;
> +        hotplugNum++;
>          hotplugMemory = mem->size;
>  
>          if (qemuDomainDefValidateMemoryHotplugDevice(mem, def) < 0)
>              return -1;
>      }
>  
> +    for (i = 0; i < def->nmems; i++) {
> +        switch (def->mems[i]->model) {
> +        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> +        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> +        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +            hotplugMemory += def->mems[i]->size;
> +            hotplugNum++;
> +            /* already existing devices don't need to be checked on hotplug */
> +            if (!mem &&
> +                qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)
> +                return -1;
> +            break;
> +
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +            /* sgx epc memory does not support hotplug */
> +        case VIR_DOMAIN_MEMORY_MODEL_LAST:
> +        case VIR_DOMAIN_MEMORY_MODEL_NONE:
> +            break;
> +        }
> +    }
> +
>      if (!virDomainDefHasMemoryHotplug(def)) {
> -        if (nmems) {
> +        if (hotplugNum) {
>              virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
>                             _("cannot use/hotplug a memory device when domain "
>                               "'maxMemory' is not defined"));
> @@ -9203,22 +9232,13 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
>          }
>      }
>  
> -    if (nmems > def->mem.memory_slots) {
> +    if (hotplugNum > def->mem.memory_slots) {
>          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>                         _("memory device count '%u' exceeds slots count '%u'"),
> -                       nmems, def->mem.memory_slots);
> +                       hotplugNum, def->mem.memory_slots);
>          return -1;
>      }
>  
> -    for (i = 0; i < def->nmems; i++) {
> -        hotplugMemory += def->mems[i]->size;
> -
> -        /* already existing devices don't need to be checked on hotplug */
> -        if (!mem &&
> -            qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)
> -            return -1;
> -    }
> -
>      if (hotplugMemory > hotplugSpace) {
>          virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
>                         _("memory device total size exceeds hotplug space"));
> diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
> index 753733d1b9..a111ae4d0c 100644
> --- a/src/qemu/qemu_domain_address.c
> +++ b/src/qemu/qemu_domain_address.c
> @@ -389,6 +389,7 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def,
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>          case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
>          }
> @@ -1039,6 +1040,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>          case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              return 0;
>          }
> @@ -2421,6 +2423,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>          case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
>          }
> @@ -3081,6 +3084,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
>          return qemuDomainEnsurePCIAddress(vm, &dev);
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> @@ -3107,6 +3111,7 @@ qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm,
>          qemuDomainReleaseDeviceAddress(vm, &mem->info);
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> @@ -3140,6 +3145,7 @@ qemuDomainAssignMemorySlots(virDomainDef *def)
>          case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
>              /* handled in qemuDomainAssignPCIAddresses() */
>              break;
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index 3b5c3db67c..79a6c420c0 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -7156,6 +7156,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDomainMemoryDef *oldDef,
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>                         _("cannot modify memory of model '%s'"),
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index 771a623ef7..b907387f21 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -3935,6 +3935,7 @@ qemuProcessDomainMemoryDefNeedHugepagesPath(const virDomainMemoryDef *mem,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          /* None of these can be backed by hugepages. */
>          return false;
> @@ -4009,6 +4010,7 @@ qemuProcessNeedMemoryBackingPath(virDomainDef *def,
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
>          case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              /* Backed by user provided path. Not stored in memory
>               * backing dir anyway. */
> diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> index 39210ba65b..fbbfedd095 100644
> --- a/src/qemu/qemu_validate.c
> +++ b/src/qemu/qemu_validate.c
> @@ -5173,6 +5173,14 @@ qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
>          }
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) {
> +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> +                           _("sgx epc isn't supported by this QEMU binary"));
> +            return -1;
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
> index 008384dee8..36e8ce42b5 100644
> --- a/src/security/security_apparmor.c
> +++ b/src/security/security_apparmor.c
> @@ -687,6 +687,7 @@ AppArmorSetMemoryLabel(virSecurityManager *mgr,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
>      }
> diff --git a/src/security/security_dac.c b/src/security/security_dac.c
> index 21cebae694..d94995c9cf 100644
> --- a/src/security/security_dac.c
> +++ b/src/security/security_dac.c
> @@ -1853,6 +1853,7 @@ virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          ret = 0;
> @@ -2040,6 +2041,7 @@ virSecurityDACSetMemoryLabel(virSecurityManager *mgr,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          ret = 0;
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index e2f34a27dc..6657663483 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -1580,6 +1580,7 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
>      }
> @@ -1608,6 +1609,7 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          ret = 0;
> diff --git a/tests/qemuxml2argvdata/sgx-epc-numa.xml b/tests/qemuxml2argvdata/sgx-epc-numa.xml
> new file mode 100644
> index 0000000000..f28b06dd79
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc-numa.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'>2</vcpu>
> +  <cpu>
> +    <numa>
> +      <cell id="0" cpus="0" memory="109550" unit="KiB"/>
> +      <cell id="1" cpus="1" memory="109550" unit="KiB"/>
> +    </numa>
> +  </cpu>
> +  <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='usb' index='0' model='none'/>
> +    <controller type='sata' index='0'>
> +      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
> +    </controller>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <audio id='1' type='none'/>
> +    <memory model='sgx-epc'>
> +      <source>
> +        <nodemask>0-1</nodemask>
> +      </source>
> +      <target>
> +        <size unit='MiB'>64</size>
> +        <node>0</node>
> +      </target>
> +    </memory>
> +    <memory model='sgx-epc'>
> +      <source>
> +        <nodemask>2-3</nodemask>
> +      </source>
> +      <target>
> +        <size unit='MiB'>16</size>
> +        <node>1</node>
> +      </target>
> +    </memory>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2argvdata/sgx-epc.xml b/tests/qemuxml2argvdata/sgx-epc.xml
> new file mode 100644
> index 0000000000..65ae8ae296
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc.xml
> @@ -0,0 +1,36 @@
> +<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='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='usb' index='0' model='none'/>
> +    <controller type='sata' index='0'>
> +      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
> +    </controller>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <audio id='1' type='none'/>
> +    <memory model='sgx-epc'>
> +      <target>
> +        <size unit='MiB'>64</size>
> +      </target>
> +    </memory>
> +    <memory model='sgx-epc'>
> +      <target>
> +        <size unit='MiB'>16</size>
> +      </target>
> +    </memory>
> +  </devices>
> +</domain>
> diff --git a/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml b/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
> new file mode 100644
> index 0000000000..ceab82110c
> --- /dev/null
> +++ b/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml

This, and the other xmloutdata file can be just a symlink to their
originals in xml2argvdata/ dirs.

Michal


From mprivozn at redhat.com  Wed Jul 20 11:26:46 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:46 +0200
Subject: [libvirt][PATCH v13 3/6] Convert QMP capabilities to domain
 capabilities
In-Reply-To: <20220701191446.727066-4-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-4-lin.a.yang@intel.com>
Message-ID: <0040ffc0-ab7a-3044-2dfa-866cf1d50623@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> the QMP capabilities:
>   {"return":
>     {
>       "sgx": true,
>       "section-size": 1024,
>       "flc": true
>     }
>   }
> 
> the domain capabilities:
>   <sgx>
>     <flc>yes</flc>
>     <epc_size>1</epc_size>
>   </sgx>
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> ---
>  src/qemu/qemu_capabilities.c                  | 230 ++++++++++++++++++
>  src/qemu/qemu_capabilities.h                  |   4 +
>  .../caps_6.2.0.x86_64.replies                 |  30 ++-
>  .../caps_6.2.0.x86_64.xml                     |   7 +
>  .../caps_7.0.0.x86_64.replies                 |  34 ++-
>  .../caps_7.0.0.x86_64.xml                     |  11 +
>  .../caps_7.1.0.x86_64.replies                 |  34 ++-
>  .../caps_7.1.0.x86_64.xml                     |  11 +
>  8 files changed, 346 insertions(+), 15 deletions(-)
> 
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 2c3be3ecec..57b5acb150 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
>                "chardev.qemu-vdagent", /* QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
>                "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
>                "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
> +              "sgx-epc", /* QEMU_CAPS_SGX_EPC */
>      );
>  
>  
> @@ -752,6 +753,8 @@ struct _virQEMUCaps {
>  
>      virSEVCapability *sevCapabilities;
>  
> +    virSGXCapability *sgxCapabilities;
> +
>      /* Capabilities which may differ depending on the accelerator. */
>      virQEMUCapsAccel kvm;
>      virQEMUCapsAccel hvf;
> @@ -1394,6 +1397,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
>      { "s390-pv-guest", QEMU_CAPS_S390_PV_GUEST },
>      { "virtio-mem-pci", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI },
>      { "virtio-iommu-pci", QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI },
> +    { "sgx-epc", QEMU_CAPS_SGX_EPC },
>  };
>  
>  
> @@ -1972,6 +1976,32 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst,
>  }
>  
>  
> +static int
> +virQEMUCapsSGXInfoCopy(virSGXCapability **dst,
> +                       virSGXCapability *src)
> +{
> +    g_autoptr(virSGXCapability) tmp = NULL;
> +

For a convenience of caller, we can have a src == NULL check here and
return early.

> +    tmp = g_new0(virSGXCapability, 1);
> +
> +    tmp->flc = src->flc;
> +    tmp->sgx1 = src->sgx1;
> +    tmp->sgx2 = src->sgx2;
> +    tmp->section_size = src->section_size;
> +
> +    if (src->nSections == 0) {
> +        tmp->nSections = 0;
> +        tmp->pSections = NULL;
> +    } else {
> +        tmp->nSections = src->nSections;
> +        tmp->pSections = src->pSections;

Ouch, this will definitely lead to a double free. If I run
qemucapabilitiestest after this patch I can see it clearly. I don't
quite understand why you didn't though. Fortunately, we can use plain
memcpy() since virSection struct does not contain any pointer, just a
pair of integers.

> +    }
> +
> +    *dst = g_steal_pointer(&tmp);
> +    return 0;
> +}
> +
> +
>  static void
>  virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
>                                   virQEMUCapsAccel *src)
> @@ -2053,6 +2083,12 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
>                                 qemuCaps->sevCapabilities) < 0)
>          return NULL;
>  
> +
> +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) &&
> +        virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities,
> +                               qemuCaps->sgxCapabilities) < 0)
> +        return NULL;
> +
>      return g_steal_pointer(&ret);
>  }
>  
> @@ -2091,6 +2127,7 @@ void virQEMUCapsDispose(void *obj)
>      virCPUDataFree(qemuCaps->cpuData);
>  
>      virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
> +    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
>  
>      virQEMUCapsAccelClear(&qemuCaps->kvm);
>      virQEMUCapsAccelClear(&qemuCaps->hvf);
> @@ -2616,6 +2653,13 @@ virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps)
>  }
>  
>  
> +virSGXCapabilityPtr
> +virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps)
> +{
> +    return qemuCaps->sgxCapabilities;
> +}
> +
> +
>  static int
>  virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
>                              qemuMonitor *mon)
> @@ -3442,6 +3486,31 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCaps *qemuCaps,
>  }
>  
>  
> +static int
> +virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qemuCaps,
> +                                   qemuMonitor *mon)
> +{
> +    int rc = -1;
> +    virSGXCapability *caps = NULL;
> +
> +    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
> +        return 0;
> +
> +    if ((rc = qemuMonitorGetSGXCapabilities(mon, &caps)) < 0)
> +        return -1;
> +
> +    /* SGX isn't actually supported */
> +    if (rc == 0) {
> +        virQEMUCapsClear(qemuCaps, QEMU_CAPS_SGX_EPC);
> +        return 0;
> +    }
> +
> +    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
> +    qemuCaps->sgxCapabilities = caps;
> +    return 0;
> +}
> +
> +
>  /*
>   * Filter for features which should never be passed to QEMU. Either because
>   * QEMU never supported them or they were dropped as they never did anything
> @@ -4220,6 +4289,116 @@ virQEMUCapsParseSEVInfo(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
>  }
>  
>  
> +static int
> +virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
> +                        xmlXPathContextPtr ctxt)
> +{
> +    g_autoptr(virSGXCapability) sgx = NULL;
> +    xmlNodePtr node;
> +
> +    g_autofree xmlNodePtr *nodes = NULL;
> +    g_autofree xmlNodePtr *sectionNodes = NULL;
> +    g_autofree char *flc = NULL;
> +    g_autofree char *sgx1 = NULL;
> +    g_autofree char *sgx2 = NULL;
> +
> +    int n = 0;
> +    int nsections = 0;

No need for extra empty lines. It's okay if this is one block.

> +
> +    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
> +        return 0;
> +
> +    if (virXPathBoolean("boolean(./sgx)", ctxt) == 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing SGX platform data in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    sgx = g_new0(virSGXCapability, 1);
> +
> +    if ((!(flc = virXPathString("string(./sgx/flc)", ctxt))) ||
> +        virStringParseYesNo(flc, &sgx->flc) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or invalid SGX platform flc in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if ((!(sgx1 = virXPathString("string(./sgx/sgx1)", ctxt))) ||
> +        virStringParseYesNo(sgx1, &sgx->sgx1) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or invalid SGX platform sgx1 in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if ((!(sgx2 = virXPathString("string(./sgx/sgx2)", ctxt))) ||
> +        virStringParseYesNo(sgx2, &sgx->sgx2) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or invalid SGX platform sgx2 in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if (virXPathULongLong("string(./sgx/section_size)", ctxt, &sgx->section_size) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or malformed SGX platform section_size in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if ((n = virXPathNodeSet("./sgx/sections", ctxt, &nodes)) < 0) {

Here, were intrested in a single occurrance, thus virXPathNode() could
be used.

> +        sgx->nSections = 0;
> +        sgx->pSections = NULL;
> +        VIR_INFO("Sections was not obtained, so QEMU version is 6.2.0");

Again, no need for extra NOPs, VIR_INFO()...

> +        qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> +        return 0;
> +    }
> +
> +    if (n == 0) {
> +        qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> +        return 0;
> +    }
> +
> +    // Got the section, the QEMU version is above 7.0.0

We like c89 style of comments.

> +    node = ctxt->node;
> +    ctxt->node = nodes[0];
> +    nsections = virXPathNodeSet("./section", ctxt, &sectionNodes);
> +    ctxt->node = node;
> +
> +    if (nsections < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("failed to parse CPU blockers in QEMU capabilities"));
> +        return -1;
> +    }
> +
> +    if (nsections > 0) {
> +        size_t i;
> +        g_autofree char * strNode = NULL;
> +        g_autofree char * strSize = NULL;
> +        sgx->nSections = nsections;
> +        sgx->pSections = g_new0(virSection, nsections + 1);
> +
> +        for (i = 0; i < nsections; i++) {
> +            if ((strNode = virXMLPropString(sectionNodes[i], "node")) &&
> +                (virStrToLong_ui(strNode, NULL, 10, &(sgx->pSections[i].node)) < 0)) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                                _("missing node name in QEMU "
> +                                    "capabilities cache"));

Error messages are extempt from 80 chars line rule. The reason is:
simpler git-grep. I, as a developer, can take whatever portion of error
message and 'git grep' it and find it easily. But if the message is
broken into multiple lines it's more tricky to do.

> +                return -1;
> +            }
> +
> +            if ((strSize = virXMLPropString(sectionNodes[i], "size")) &&
> +                (virStrToLong_ull(strSize, NULL, 10, &(sgx->pSections[i].size)) < 0)) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                                _("missing size name in QEMU "
> +                                    "capabilities cache"));
> +                return -1;
> +            }
> +        }
> +    }
> +
> +    qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> +    return 0;
> +}
> +
> +
>  static int
>  virQEMUCapsParseFlags(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
>  {
> @@ -4522,6 +4701,9 @@ virQEMUCapsLoadCache(virArch hostArch,
>      if (virQEMUCapsParseSEVInfo(qemuCaps, ctxt) < 0)
>          return -1;
>  
> +    if (virQEMUCapsParseSGXInfo(qemuCaps, ctxt) < 0)
> +        return -1;
> +
>      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
>          virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);
>      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_HVF))
> @@ -4707,6 +4889,49 @@ virQEMUCapsFormatSEVInfo(virQEMUCaps *qemuCaps, virBuffer *buf)
>  }
>  
>  
> +static void
> +virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
> +                         virBuffer *buf)
> +{
> +    virSGXCapabilityPtr sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
> +    size_t i;
> +
> +    virBufferAddLit(buf, "<sgx supported='yes'>\n");
> +    virBufferAdjustIndent(buf, 2);
> +    if (sgx->flc) {
> +        virBufferAsprintf(buf, "<flc>%s</flc>\n", "yes");
> +    } else {
> +        virBufferAsprintf(buf, "<flc>%s</flc>\n", "no");
> +    }

Well, this works. But how about:

if (sgx->flc) {
  virBufferAddLit(buf, "<flc>yes</flc>\n");
} else {
  virBufferAddLit(buf, "<flc>no</flc>\n");
}

which saves and extra call to printf() for a static string? Or even better:

  virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");

> +    if (sgx->sgx1) {
> +        virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "yes");
> +    } else {
> +        virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "no");
> +    }
> +    if (sgx->sgx2) {
> +        virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "yes");
> +    } else {
> +        virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "no");
> +    }
> +    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
> +
> +    if (sgx->nSections > 0) {
> +        virBufferAddLit(buf, "<sections>\n");
> +
> +        for (i = 0; i < sgx->nSections; i++) {
> +            virBufferAdjustIndent(buf, 2);
> +            virBufferAsprintf(buf, "<section node='%u' ", sgx->pSections[i].node);
> +            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->pSections[i].size);
> +            virBufferAdjustIndent(buf, -2);
> +        }
> +        virBufferAddLit(buf, "</sections>\n");
> +    }
> +
> +    virBufferAdjustIndent(buf, -2);
> +    virBufferAddLit(buf, "</sgx>\n");
> +}
> +
> +
>  char *
>  virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
>  {
> @@ -4788,6 +5013,9 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
>      if (qemuCaps->sevCapabilities)
>          virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
>  
> +    if (qemuCaps->sgxCapabilities)
> +        virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
> +
>      if (qemuCaps->kvmSupportsNesting)
>          virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
>  
> @@ -5455,6 +5683,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
>          return -1;
>      if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
>          return -1;
> +    if (virQEMUCapsProbeQMPSGXCapabilities(qemuCaps, mon) < 0)
> +        return -1;
>  
>      virQEMUCapsInitProcessCaps(qemuCaps);
>  
> diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
> index 6f35ba1485..fc8c0fde1b 100644
> --- a/src/qemu/qemu_capabilities.h
> +++ b/src/qemu/qemu_capabilities.h
> @@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
>      QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent */
>      QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
>      QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
> +    QEMU_CAPS_SGX_EPC, /* -object sgx-epc,... */
>  
>      QEMU_CAPS_LAST /* this must always be the last item */
>  } virQEMUCapsFlags;
> @@ -843,6 +844,9 @@ virQEMUCapsCPUFeatureFromQEMU(virQEMUCaps *qemuCaps,
>  virSEVCapability *
>  virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps);
>  
> +virSGXCapabilityPtr
> +virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps);
> +
>  bool
>  virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_GNUC_NO_INLINE;
>  
> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> index e235532d62..0151ab07fa 100644
> --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> @@ -7459,15 +7459,15 @@
>            "type": "bool"
>          },
>          {
> -          "name": "sgx1",
> +          "name": "flc",
>            "type": "bool"
>          },
>          {
> -          "name": "sgx2",
> +          "name": "sgx1",
>            "type": "bool"
>          },
>          {
> -          "name": "flc",
> +          "name": "sgx2",
>            "type": "bool"
>          },
>          {

This move does not seem to be warranted. When Peter generated the file
I'm quite certain that this was genuine order of attributes in which
QEMU replied. Furthermore, nothing in our code relies on ordering of
these particular attributes. Why is this necessary?

In fact, the QEMU I've built from git recently (v7.0.0-2668-gf9d9fff72e)
replied in this order:

{"return": {"sgx": true, "sgx2": false, "sgx1": true, "sections":
[{"size": 98041856, "node": 0}], "section-size": 98041856, "flc":
false}, "id": "libvirt-50"}

Michal


From mprivozn at redhat.com  Wed Jul 20 11:26:48 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:48 +0200
Subject: [libvirt][PATCH v13 4/6] conf: expose SGX feature in domain
 capabilities
In-Reply-To: <20220701191446.727066-5-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-5-lin.a.yang@intel.com>
Message-ID: <fb74ca03-fac1-1631-a3ca-5be26c666d03@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> Extend hypervisor capabilities to include sgx feature. When available,
> the hypervisor supports launching an VM with SGX on Intel platfrom.
> The SGX feature tag privides additional details like section size and
> sgx1 or sgx2.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> ---
>  docs/formatdomaincaps.rst                     | 40 ++++++++++++++++
>  src/conf/domain_capabilities.c                | 48 +++++++++++++++++++
>  src/conf/schemas/domaincaps.rng               | 42 ++++++++++++++++
>  src/qemu/qemu_capabilities.c                  | 28 +++++++++++
>  tests/domaincapsdata/bhyve_basic.x86_64.xml   |  1 +
>  tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |  1 +
>  tests/domaincapsdata/bhyve_uefi.x86_64.xml    |  1 +
>  tests/domaincapsdata/empty.xml                |  1 +
>  tests/domaincapsdata/libxl-xenfv.xml          |  1 +
>  tests/domaincapsdata/libxl-xenpv.xml          |  1 +
>  .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml |  1 +
>  .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml |  1 +
>  tests/domaincapsdata/qemu_2.11.0.s390x.xml    |  1 +
>  tests/domaincapsdata/qemu_2.11.0.x86_64.xml   |  1 +
>  .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml |  1 +
>  .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml |  1 +
>  .../qemu_2.12.0-virt.aarch64.xml              |  1 +
>  tests/domaincapsdata/qemu_2.12.0.aarch64.xml  |  1 +
>  tests/domaincapsdata/qemu_2.12.0.ppc64.xml    |  1 +
>  tests/domaincapsdata/qemu_2.12.0.s390x.xml    |  1 +
>  tests/domaincapsdata/qemu_2.12.0.x86_64.xml   |  1 +
>  .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  |  1 +
>  tests/domaincapsdata/qemu_3.0.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_3.0.0.s390x.xml     |  1 +
>  tests/domaincapsdata/qemu_3.0.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |  1 +
>  tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |  1 +
>  .../qemu_4.0.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_4.0.0.s390x.xml     |  1 +
>  tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  1 +
>  tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  1 +
>  .../qemu_4.2.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_4.2.0.s390x.xml     |  1 +
>  tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
>  .../qemu_5.0.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  1 +
>  tests/domaincapsdata/qemu_5.1.0.sparc.xml     |  1 +
>  tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |  1 +
>  .../qemu_5.2.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_5.2.0.s390x.xml     |  1 +
>  tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |  1 +
>  .../qemu_6.0.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_6.0.0.s390x.xml     |  1 +
>  tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |  1 +
>  .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |  1 +
>  tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |  1 +
>  .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  6 +++
>  .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  6 +++
>  .../qemu_6.2.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  6 +++
>  .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 10 ++++
>  .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 10 ++++
>  .../qemu_7.0.0-virt.aarch64.xml               |  1 +
>  tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |  1 +
>  tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |  1 +
>  tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 10 ++++
>  .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 10 ++++
>  .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 10 ++++
>  tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 10 ++++
>  88 files changed, 311 insertions(+)
> 
> diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
> index 933469b2a2..d3bdee28d4 100644
> --- a/docs/formatdomaincaps.rst
> +++ b/docs/formatdomaincaps.rst
> @@ -519,6 +519,16 @@ capabilities. All features occur as children of the main ``features`` element.
>           <cbitpos>47</cbitpos>
>           <reduced-phys-bits>1</reduced-phys-bits>
>         </sev>
> +       <sgx supported='yes'>
> +         <flc>no</flc>
> +         <sgx1>yes</sgx1>
> +         <sgx2>no</sgx2>
> +         <section_size>2</section_size>
> +         <sections>
> +           <section node='0' size='1'/>
> +           <section node='1' size='1'/>
> +         </sections>
> +       </sgx>
>       </features>
>     </domainCapabilities>
>  
> @@ -598,3 +608,33 @@ in domain XML <formatdomain.html#launch-security>`__
>  ``maxESGuests``
>     The maximum number of SEV-ES guests that can be launched on the host. This
>     value may be configurable in the firmware for some hosts.
> +
> +SGX capabilities
> +^^^^^^^^^^^^^^^^
> +
> +Intel Software Guard Extensions (Intel SGX) capabilities are exposed under the
> +``sgx`` element.
> +
> +Intel SGX helps protect data in use via unique application isolation technology.
> +Protect selected code and data from modification using hardened enclaves with
> +Intel SGX.
> +
> +For more details on the SGX feature, please follow resources in the SGX developer's
> +document store. In order to use SGX with libvirt have a look at formatdomain.rst
> +Memory devices.
> +
> +``flc``
> +   FLC (Flexible Launch Control), not strictly part of SGX2, but was not part of
> +   original SGX hardware either.
> +
> +``sgx1``
> +   the sgx version 1.
> +
> +``sgx2``
> +   The sgx version 2.
> +
> +``section_size``
> +   The size of the SGX enclave page cache (called EPC).
> +
> +``sections``
> +   The sections of the SGX enclave page cache (called EPC).
> diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
> index 27f3fb8d36..fa29f69807 100644
> --- a/src/conf/domain_capabilities.c
> +++ b/src/conf/domain_capabilities.c
> @@ -98,6 +98,7 @@ virDomainCapsDispose(void *obj)
>      virObjectUnref(caps->cpu.custom);
>      virCPUDefFree(caps->cpu.hostModel);
>      virSEVCapabilitiesFree(caps->sev);
> +    virSGXCapabilitiesFree(caps->sgx);
>  
>      values = &caps->os.loader.values;
>      for (i = 0; i < values->nvalues; i++)
> @@ -620,6 +621,52 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
>      return;
>  }
>  
> +static void
> +virDomainCapsFeatureSGXFormat(virBuffer *buf,
> +                              const virSGXCapability *sgx)
> +{
> +    size_t i;
> +
> +    if (!sgx) {
> +        virBufferAddLit(buf, "<sgx supported='no'/>\n");
> +    } else {
> +        virBufferAddLit(buf, "<sgx supported='yes'>\n");
> +        virBufferAdjustIndent(buf, 2);
> +        if (sgx->flc) {
> +            virBufferAsprintf(buf, "<flc>%s</flc>\n", "yes");
> +        } else {
> +            virBufferAsprintf(buf, "<flc>%s</flc>\n", "no");
> +        }

Same comment here as in the previous patch.

> +        if (sgx->sgx1) {
> +            virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "yes");
> +        } else {
> +            virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "no");
> +        }
> +        if (sgx->sgx2) {
> +            virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "yes");
> +        } else {
> +            virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "no");
> +        }
> +        virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
> +
> +        if (sgx->nSections > 0) {
> +            virBufferAddLit(buf, "<sections>\n");
> +
> +            for (i = 0; i < sgx->nSections; i++) {
> +                virBufferAdjustIndent(buf, 2);
> +                virBufferAsprintf(buf, "<section node='%u' ", sgx->pSections[i].node);
> +                virBufferAsprintf(buf, "size='%llu'/>\n", sgx->pSections[i].size);
> +                virBufferAdjustIndent(buf, -2);
> +            }
> +            virBufferAddLit(buf, "</sections>\n");
> +        }
> +
> +        virBufferAdjustIndent(buf, -2);
> +        virBufferAddLit(buf, "</sgx>\n");
> +    }
> +
> +    return;
> +}
>  
>  static void
>  virDomainCapsFormatFeatures(const virDomainCaps *caps,
> @@ -640,6 +687,7 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps,
>      }
>  
>      virDomainCapsFeatureSEVFormat(&childBuf, caps->sev);
> +    virDomainCapsFeatureSGXFormat(&childBuf, caps->sgx);
>  
>      virXMLFormatElement(buf, "features", NULL, &childBuf);
>  }
> diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng
> index 9cbc2467ab..6975ebacb9 100644
> --- a/src/conf/schemas/domaincaps.rng
> +++ b/src/conf/schemas/domaincaps.rng
> @@ -270,6 +270,9 @@
>        <optional>
>          <ref name="sev"/>
>        </optional>
> +      <optional>
> +        <ref name="sgx"/>
> +      </optional>
>      </element>
>    </define>
>  
> @@ -330,6 +333,45 @@
>      </element>
>    </define>
>  
> +  <define name="sgx">
> +    <element name="sgx">
> +      <ref name="supported"/>
> +      <optional>
> +        <element name="flc">
> +          <data type="string"/>

Or, since we know we are formatting yes/no, we can use virYesNo instead
of too generic string type.

> +        </element>
> +        <element name="sgx1">
> +          <data type="string"/>
> +        </element>
> +        <element name="sgx2">
> +          <data type="string"/>
> +        </element>
> +        <element name="section_size">
> +          <attribute name="unit">
> +            <value>KiB</value>
> +          </attribute>
> +          <data type="unsignedInt"/>
> +        </element>
> +        <optional>
> +          <element name="sections">
> +            <interleave>

I think the order is well defined and thus we don't really need
<interleave/> here. The domain capabilities XML is not provided by user,
it's generated by libvirt, in virDomainCapsFormat() where the order is
well defined.

> +              <zeroOrMore>
> +                <element name="section">
> +                  <attribute name="node">
> +                    <data type="string"/>

This is an integer ..

> +                  </attribute>
> +                  <attribute name="size">
> +                    <data type="string"/>

.. and so is this.

> +                  </attribute>
> +                </element>
> +              </zeroOrMore>
> +            </interleave>
> +          </element>
> +        </optional>
> +      </optional>
> +    </element>
> +  </define>
> +
>    <define name="value">
>      <zeroOrMore>
>        <element name="value">
> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
> index 57b5acb150..598c694738 100644
> --- a/src/qemu/qemu_capabilities.c
> +++ b/src/qemu/qemu_capabilities.c
> @@ -6744,6 +6744,33 @@ virQEMUCapsFillDomainFeatureS390PVCaps(virQEMUCaps *qemuCaps,
>      }
>  }
>  
> +/**
> + * virQEMUCapsFillDomainFeatureiSGXCaps:
> + * @qemuCaps: QEMU capabilities
> + * @domCaps: domain capabilities
> + *
> + * Take the information about SGX capabilities that has been obtained
> + * using the 'query-sgx-capabilities' QMP command and stored in @qemuCaps
> + * and convert it to a form suitable for @domCaps.
> + */
> +static void
> +virQEMUCapsFillDomainFeatureSGXCaps(virQEMUCaps *qemuCaps,
> +                                    virDomainCaps *domCaps)
> +{
> +    virSGXCapability *cap = qemuCaps->sgxCapabilities;
> +
> +    if (!cap)
> +        return;
> +
> +    domCaps->sgx = g_new0(virSGXCapability, 1);
> +
> +    domCaps->sgx->flc = cap->flc;
> +    domCaps->sgx->sgx1 = cap->sgx1;
> +    domCaps->sgx->sgx2 = cap->sgx2;
> +    domCaps->sgx->section_size = cap->section_size;
> +    domCaps->sgx->nSections = cap->nSections;
> +    domCaps->sgx->pSections = cap->pSections;

This is a verbatim copy of virQEMUCapsSGXInfoCopy(), any reason for not
just call the function?

> +}

Michal


From mprivozn at redhat.com  Wed Jul 20 11:26:50 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:50 +0200
Subject: [libvirt][PATCH v13 2/6] Get SGX capabilities form QMP
In-Reply-To: <20220701191446.727066-3-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-3-lin.a.yang@intel.com>
Message-ID: <a3e35a71-516c-bf59-b42d-bb4a3c589a3d@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> Generate the QMP command for query-sgx-capabilities and the command
> return sgx capabilities from QMP.
> 
> {"execute":"query-sgx-capabilities"}
> 
> the right reply:
>   {"return":
>     {
>       "sgx": true,
>       "section-size": 197132288,
>       "flc": true
>     }
>   }
> 
> the error reply:
>   {"error":
>     {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
>   }
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> ---
>  src/qemu/qemu_monitor.c      |  10 ++++
>  src/qemu/qemu_monitor.h      |   3 +
>  src/qemu/qemu_monitor_json.c | 113 +++++++++++++++++++++++++++++++++++
>  src/qemu/qemu_monitor_json.h |   4 ++
>  4 files changed, 130 insertions(+)
> 
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index fda5d2f368..a1b2138921 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -3653,6 +3653,16 @@ qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
>  }
>  
>  
> +int
> +qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
> +                              virSGXCapability **capabilities)
> +{
> +    QEMU_CHECK_MONITOR(mon);
> +
> +    return qemuMonitorJSONGetSGXCapabilities(mon, capabilities);
> +}
> +
> +
>  int
>  qemuMonitorNBDServerStart(qemuMonitor *mon,
>                            const virStorageNetHostDef *server,
> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
> index 95267ec6c7..451ac8eec9 100644
> --- a/src/qemu/qemu_monitor.h
> +++ b/src/qemu/qemu_monitor.h
> @@ -864,6 +864,9 @@ int qemuMonitorGetGICCapabilities(qemuMonitor *mon,
>  int qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
>                                    virSEVCapability **capabilities);
>  
> +int qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
> +                                  virSGXCapability **capabilities);
> +
>  typedef enum {
>    QEMU_MONITOR_MIGRATE_BACKGROUND       = 1 << 0,
>    QEMU_MONITOR_MIGRATE_NON_SHARED_DISK  = 1 << 1, /* migration with non-shared storage with full disk copy */
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 3aad2ab212..c900956f82 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -6445,6 +6445,119 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
>      return 1;
>  }
>  
> +
> +/**
> + * qemuMonitorJSONGetSGXCapabilities:
> + * @mon: qemu monitor object
> + * @capabilities: pointer to pointer to a SGX capability structure to be filled
> + *
> + * This function queries and fills in INTEL's SGX platform-specific data.
> + * Note that from QEMU's POV both -object sgx-epc and query-sgx-capabilities
> + * can be present even if SGX is not available, which basically leaves us with
> + * checking for JSON "GenericError" in order to differentiate between compiled-in
> + * support and actual SGX support on the platform.
> + *
> + * Returns: -1 on error,
> + *           0 if SGX is not supported, and
> + *           1 if SGX is supported on the platform.
> + */
> +int
> +qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
> +                                  virSGXCapability **capabilities)
> +{
> +    g_autoptr(virJSONValue) cmd = NULL;
> +    g_autoptr(virJSONValue) reply = NULL;
> +    g_autoptr(virSGXCapability) capability = NULL;
> +
> +    virJSONValue *sections = NULL;
> +    virJSONValue *caps;
> +    bool flc = false;
> +    bool sgx1 = false;
> +    bool sgx2 = false;
> +    unsigned long long section_size = 0;
> +    unsigned long long size;
> +    size_t i;
> +
> +    *capabilities = NULL;
> +    capability = g_new0(virSGXCapability, 1);
> +
> +    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities", NULL)))
> +        return -1;
> +
> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> +        return -1;
> +
> +    /* QEMU has only compiled-in support of SGX */
> +    if (qemuMonitorJSONHasError(reply, "GenericError"))
> +        return 0;
> +
> +    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
> +        return -1;
> +
> +    caps = virJSONValueObjectGetObject(reply, "return");
> +
> +    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'flc' field"));
> +        return -1;
> +    }
> +    capability->flc = flc;
> +
> +    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
> +        return -1;
> +    }
> +    capability->sgx1 = sgx1;
> +
> +    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
> +        return -1;
> +    }
> +    capability->sgx2 = sgx2;
> +
> +    if (virJSONValueObjectGetNumberUlong(caps, "section-size", &section_size) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'section-size' field"));
> +        return -1;
> +    }
> +    capability->section_size = section_size/1024;

Spaces around the operand please.

> +
> +    if (!(sections = virJSONValueObjectGetArray(caps, "sections"))) {
> +        capability->nSections = 0;
> +        capability->pSections = NULL;

This is needless. g_new0() used above made sure that the memory is
zeroed out upon allocation, so these two lines are NOP.

> +        VIR_INFO("Sections was not obtained, so QEMU version is 6.2.0");

VIR_INFO() is probably too harsh. It's not anything that users should be
concerned about. VIR_DEBUG() is much better. But then again, when debug
logs are enabled then the QMP command and its reply are seen in the log
and thus anybody reading it sees immediately whether a part is missing
or not.

> +        *capabilities = g_steal_pointer(&capability);
> +        return 1;
> +    }
> +
> +    // Got the section, the QEMU version is above 7.0.0
> +    capability->nSections = virJSONValueArraySize(sections);
> +    capability->pSections = g_new0(virSection, capability->nSections + 1);

This + 1 looks wrong to me. We already have nSections, and pSections is
not an array of pointers either. So NULL terminated array is a bit overkill.

> +
> +    for (i = 0; i < capability->nSections; i++) {
> +        virJSONValue *elem = virJSONValueArrayGet(sections, i);
> +
> +        if (virJSONValueObjectGetNumberUlong(elem, "size", &size) < 0) {
> +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                           _("query-sgx-capabilities reply was missing 'size' field"));
> +            return -1;
> +        }
> +        capability->pSections[i].size = size/1024;
> +
> +        if (virJSONValueObjectGetNumberUint(elem, "node", &(capability->pSections[i].node)) < 0) {
> +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                           _("query-sgx-capabilities reply was missing 'node' field"));
> +            return -1;
> +        }
> +    }
> +
> +    *capabilities = g_steal_pointer(&capability);
> +    return 1;
> +}

Michal


From mprivozn at redhat.com  Wed Jul 20 11:26:52 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 13:26:52 +0200
Subject: [libvirt][PATCH v13 1/6] Define SGX capabilities structs
In-Reply-To: <20220701191446.727066-2-lin.a.yang@intel.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-2-lin.a.yang@intel.com>
Message-ID: <f7e4690a-639f-7854-bd34-6fe3ab39f7a5@redhat.com>

On 7/1/22 21:14, Lin Yang wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> ---
>  src/conf/domain_capabilities.c | 10 ++++++++++
>  src/conf/domain_capabilities.h | 24 ++++++++++++++++++++++++
>  src/libvirt_private.syms       |  1 +
>  3 files changed, 35 insertions(+)
> 
> diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
> index 895e8d00e8..27f3fb8d36 100644
> --- a/src/conf/domain_capabilities.c
> +++ b/src/conf/domain_capabilities.c
> @@ -76,6 +76,16 @@ virSEVCapabilitiesFree(virSEVCapability *cap)
>  }
>  
>  
> +void
> +virSGXCapabilitiesFree(virSGXCapability *cap)
> +{
> +    if (!cap)
> +        return;
> +

This leaks cap->pSections.

> +    g_free(cap);
> +}
> +
> +
>  static void
>  virDomainCapsDispose(void *obj)
>  {
> diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
> index f2eed80b15..dac1098e98 100644
> --- a/src/conf/domain_capabilities.h
> +++ b/src/conf/domain_capabilities.h
> @@ -192,6 +192,24 @@ struct _virSEVCapability {
>      unsigned int max_es_guests;
>  };
>  
> +typedef struct _virSection virSection;
> +typedef virSection *virSectionPtr;

No, if we can help it I'd rather avoid introducing virXXXPtr typedef.
We've worked hard to get rid of them and I don't quite see a reason to
reintroduce them.

> +struct _virSection {
> +    unsigned long long size;
> +    unsigned int node;

While it's true that QEMU with its current code does not ever report a
negative number for 'node', at the QAPI level it's declared as signed
integer and thus we ought to reflect that.

> +};
> +
> +typedef struct _virSGXCapability virSGXCapability;
> +typedef virSGXCapability *virSGXCapabilityPtr;
> +struct _virSGXCapability {
> +    bool flc;
> +    bool sgx1;
> +    bool sgx2;
> +    unsigned long long section_size;
> +    size_t nSections;
> +    virSectionPtr pSections;

We tend to use: 'nitems' and 'items', or 'nsections' and 'sections' in
cases like this.

> +};
> +

Michal


From jdenemar at redhat.com  Wed Jul 20 11:29:55 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 13:29:55 +0200
Subject: [libvirt PATCH v2 4/5] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <CAJaqyWcizJWDN6xb33P3op_T6gLaQfA36OK=KXT9x=OwetcPuQ@mail.gmail.com>
References: <20220720091154.3135061-1-eperezma@redhat.com>
 <20220720091154.3135061-5-eperezma@redhat.com>
 <YtfZgOlSktgfcSKR@orkuz.int.mamuti.net>
 <CAJaqyWcizJWDN6xb33P3op_T6gLaQfA36OK=KXT9x=OwetcPuQ@mail.gmail.com>
Message-ID: <YtfnM1ORN3nHBS/I@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 13:25:45 +0200, Eugenio Perez Martin wrote:
> On Wed, Jul 20, 2022 at 12:31 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> >
> > On Wed, Jul 20, 2022 at 11:11:53 +0200, Eugenio P?rez wrote:
> > > since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> > > will return an array of error strings describing the migration blockers.
> > > This can be used to check whether there are any devices blocking
> > > migration, etc.
> > >
> > > Enable qemuMigrationSrcIsAllowed to query it.
> > >
> > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > ---
> > >  src/qemu/qemu_migration.c | 33 +++++++++++++++++++++++++++++++++
> > >  1 file changed, 33 insertions(+)
> > >
> > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > index b12cb518ee..4224339f39 100644
> > > --- a/src/qemu/qemu_migration.c
> > > +++ b/src/qemu/qemu_migration.c
> > > @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
> > >      return true;
> > >  }
> > >
> > > +static int
> > > +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> > > +                               virDomainObj *vm,
> > > +                               char ***blockers)
> > > +{
> > > +    qemuDomainObjPrivate *priv = vm->privateData;
> > > +    int rc;
> > > +
> > > +    qemuDomainObjEnterMonitor(driver, vm);
> > > +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> > > +    qemuDomainObjExitMonitor(vm);
> > > +
> > > +    return rc;
> > > +}
> > >
> > >  /**
> > >   * qemuMigrationSrcIsAllowed:
> > > @@ -1439,6 +1453,25 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> > >      int nsnapshots;
> > >      int pauseReason;
> > >      size_t i;
> > > +    int r;
> > > +
> > > +    /* Ask qemu if it have a migration blocker */
> > > +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > > +        g_auto(GStrv) blockers = NULL;
> > > +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> > > +        if (r != 0) {
> > > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > > +                           _("cannot migrate domain, %s"),
> > > +                           _("error getting blockers"));
> >
> > If qemuDomainGetMigrationBlockers returned -1 a better error message
> > should already be set and you would overwrite it here. Also with your
> > current patch you would report this error even in case there was no
> > migration blocker reported by QEMU. But this part would be fixed by
> > letting qemuDomainGetMigrationBlockers return 0 when the blocked-reasons
> > field is missing.
> >
> 
> Got it.
> 
> > > +            return false;
> > > +        }
> > > +
> > > +        if (blockers[0]) {
> >
> > blockers && blockers[0]
> >
> > > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > > +                           _("cannot migrate domain, %s"), blockers[0]);
> >
> > I would prefer a colon there: "cannot migrate domain: %s". And we got a
> > list of blockers from QEMU, but only use the first one? Please, join
> > them with g_strjoinv().
> >
> 
> So the resulting message should be:
> "cannot migrate domain: <error1>, <error2>, ..., <errorN>", right?

Yeah, something like that... or with "; " as a separator to avoid
confusion in case any migration blocker contains ','.

Jirka

From eperezma at redhat.com  Wed Jul 20 12:15:58 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 14:15:58 +0200
Subject: [libvirt PATCH v3 4/4] qemu_migration: Do not forbid vDPA devices if
 can query blockers
In-Reply-To: <20220720121558.3150209-1-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
Message-ID: <20220720121558.3150209-5-eperezma@redhat.com>

vDPA devices will be migratable soon. Since they are not migratable
before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
for migration blockers, let it hardcoded in that case.

Otherwise, ask qemu about the explicit blocker.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
v3: Fix indentation
---
 src/qemu/qemu_migration.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 6ac4ef150b..45e16242f0 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int pauseReason;
     size_t i;
     int r;
+    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
+                                            QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
 
     /* Ask qemu if it have a migration blocker */
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
+    if (blockedReasonsCap) {
         g_auto(GStrv) blockers = NULL;
         r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
         if (r != 0) {
@@ -1467,7 +1469,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
         }
 
         if (blockers && blockers[0]) {
-            g_autofree char *reasons = g_strjoinv(", ", blockers);
+            g_autofree char *reasons = g_strjoinv("; ", blockers);
             virReportError(VIR_ERR_OPERATION_INVALID,
                            _("cannot migrate domain: %s"), reasons);
             return false;
@@ -1580,7 +1582,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
             virDomainNetDef *net = vm->def->nets[i];
             qemuSlirp *slirp;
 
-            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
+            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
                 virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                                _("vDPA devices cannot be migrated"));
                 return false;
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 12:15:55 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 14:15:55 +0200
Subject: [libvirt PATCH v3 1/4] qemu: introduce capability
 QEMU_CAPS_MIGRATION_BLOCKED_REASONS
In-Reply-To: <20220720121558.3150209-1-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
Message-ID: <20220720121558.3150209-2-eperezma@redhat.com>

From: Jonathon Jongsma <jjongsma at redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
v3: s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/
---
 src/qemu/qemu_capabilities.c                      | 2 ++
 src/qemu/qemu_capabilities.h                      | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
 13 files changed, 14 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 30b396d32d..b002fb98ed 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -672,6 +672,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
               "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
+              "migration.blocked-reasons", /* QEMU_CAPS_MIGRATION_BLOCKED_REASONS */
     );
 
 
@@ -1622,6 +1623,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU_VDAGENT },
     { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS },
     { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX },
+    { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKED_REASONS },
 };
 
 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d979a5ba3b..8f3090e2ce 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -651,6 +651,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
     QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
+    QEMU_CAPS_MIGRATION_BLOCKED_REASONS, /* query-migrate returns 'blocked-reasons */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 01e30f4e02..4afd7b26ce 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -187,6 +187,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index aa7b5deab5..c9cb85daa0 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -144,6 +144,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index d9e385ab1d..508804521c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -229,6 +229,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 05f297dfa2..d4a540fafd 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -234,6 +234,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 9cb1a32354..71697fac95 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -199,6 +199,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 5df148d787..3f86e03f18 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -193,6 +193,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index dd011f8408..1a1a9643d4 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -236,6 +236,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 39a5cd154d..a3991e9853 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -207,6 +207,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 6e872f4f85..67dff32f50 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -211,6 +211,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index a8f46df1cd..8ce423557e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -241,6 +241,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 8464909698..2b2f1aef52 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -242,6 +242,7 @@
   <flag name='display-dbus'/>
   <flag name='iothread.thread-pool-max'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 12:15:54 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 14:15:54 +0200
Subject: [libvirt PATCH v3 0/4] Ask qemu about migration blockers
Message-ID: <20220720121558.3150209-1-eperezma@redhat.com>

There are some hardcoded migration blockers in libvirt, like having a net
vhost-vdpa device. While it's true that they cannot be migrated at the moment,
there are plans to be able to migrate them soon.

They'll put a migration blockers in the cases where you cannot migrate them.
Ask qemu about then before rejecting the migration. In case the question is not
possible, assume they're not migratable.

v3:
* Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
  blockers.
* Fix indentation
* Report all blockers instead of only the first.
* Squash some patches
* Move note to function doc.
* s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/

v2:
* Ask qemu if it has some pending blockers before try the migration

Eugenio P?rez (3):
  qemu_monitor: add support for get qemu migration blockers
  qemu_migration: get migration blockers before hardcoded checks
  qemu_migration: Do not forbid vDPA devices if can query blockers

Jonathon Jongsma (1):
  qemu: introduce capability QEMU_CAPS_MIGRATION_BLOCKED_REASONS

 src/qemu/qemu_capabilities.c                  |  2 +
 src/qemu/qemu_capabilities.h                  |  1 +
 src/qemu/qemu_migration.c                     | 38 +++++++++++++++-
 src/qemu/qemu_monitor.c                       | 11 +++++
 src/qemu/qemu_monitor.h                       |  4 ++
 src/qemu/qemu_monitor_json.c                  | 43 +++++++++++++++++++
 src/qemu/qemu_monitor_json.h                  |  3 ++
 .../caps_6.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  1 +
 .../caps_6.0.0.x86_64.xml                     |  1 +
 .../caps_6.1.0.x86_64.xml                     |  1 +
 .../caps_6.2.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  1 +
 .../caps_6.2.0.x86_64.xml                     |  1 +
 .../caps_7.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
 .../caps_7.0.0.x86_64.xml                     |  1 +
 .../caps_7.1.0.x86_64.xml                     |  1 +
 18 files changed, 112 insertions(+), 1 deletion(-)

-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 12:15:56 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 14:15:56 +0200
Subject: [libvirt PATCH v3 2/4] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <20220720121558.3150209-1-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
Message-ID: <20220720121558.3150209-3-eperezma@redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Enable qemu monitor to send this query.  This will allow
qemuMigrationSrcIsAllowed to dynamically ask for migration blockers,
reducing duplication.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
v3:
* Squash some patches
* Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
  blockers.
* Move note to function doc.
---
 src/qemu/qemu_monitor.c      | 11 +++++++++
 src/qemu/qemu_monitor.h      |  4 ++++
 src/qemu/qemu_monitor_json.c | 43 ++++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |  3 +++
 4 files changed, 61 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 109107eaae..e0939beecd 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4486,3 +4486,14 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONMigrateRecover(mon, uri);
 }
+
+int
+qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
+                                char ***blockers)
+{
+    VIR_DEBUG("blockers=%p", blockers);
+
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONGetMigrationBlockers(mon, blockers);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index cc1a0bc8c9..b82f198285 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1543,3 +1543,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorMigrateRecover(qemuMonitor *mon,
                           const char *uri);
+
+int
+qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
+                                char ***blockers);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 5e4a86e5ad..6d15a458a3 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3338,6 +3338,49 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
     return 0;
 }
 
+/*
+ * Get the exposed migration blockers.
+ *
+ * This function assume qemu has the capability of request them.
+ *
+ * It returns a NULL terminated array on blockers if there are any, or it set
+ * it to NULL otherwise.
+ */
+int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
+                                        char ***blockers)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    virJSONValue *data;
+    virJSONValue *jblockers;
+    size_t i;
+
+    *blockers = NULL;
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
+        return -1;
+
+    data = virJSONValueObjectGetObject(reply, "return");
+
+    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
+        return 0;
+
+    *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1);
+    for (i = 0; i < virJSONValueArraySize(jblockers); i++) {
+        virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i);
+        const char *blocker = virJSONValueGetString(jblocker);
+
+        (*blockers)[i] = g_strdup(blocker);
+    }
+
+    return 0;
+}
+
 int qemuMonitorJSONMigrateCancel(qemuMonitor *mon)
 {
     g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL);
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 2759566892..e4c65e250e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -184,6 +184,9 @@ qemuMonitorJSONMigrate(qemuMonitor *mon,
                        unsigned int flags,
                        const char *uri);
 int
+qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
+                                    char ***blockers);
+int
 qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon,
                                        bool *spice_migrated);
 
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 12:15:57 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 14:15:57 +0200
Subject: [libvirt PATCH v3 3/4] qemu_migration: get migration blockers before
 hardcoded checks
In-Reply-To: <20220720121558.3150209-1-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
Message-ID: <20220720121558.3150209-4-eperezma@redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Enable qemuMigrationSrcIsAllowed to query it.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
---
v3:
* Report message with a colon.
* Report all blockers instead of only the first.
---
 src/qemu/qemu_migration.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b12cb518ee..6ac4ef150b 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
     return true;
 }
 
+static int
+qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
+                               virDomainObj *vm,
+                               char ***blockers)
+{
+    qemuDomainObjPrivate *priv = vm->privateData;
+    int rc;
+
+    qemuDomainObjEnterMonitor(driver, vm);
+    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
+    qemuDomainObjExitMonitor(vm);
+
+    return rc;
+}
 
 /**
  * qemuMigrationSrcIsAllowed:
@@ -1439,6 +1453,26 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int nsnapshots;
     int pauseReason;
     size_t i;
+    int r;
+
+    /* Ask qemu if it have a migration blocker */
+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
+        g_auto(GStrv) blockers = NULL;
+        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
+        if (r != 0) {
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           _("cannot migrate domain: %s"),
+                           _("error getting blockers"));
+            return false;
+        }
+
+        if (blockers && blockers[0]) {
+            g_autofree char *reasons = g_strjoinv(", ", blockers);
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           _("cannot migrate domain: %s"), reasons);
+            return false;
+        }
+    }
 
     /* perform these checks only when migrating to remote hosts */
     if (remote) {
-- 
2.31.1


From mprivozn at redhat.com  Wed Jul 20 12:33:03 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 14:33:03 +0200
Subject: [libvirt PATCH] nodedev: support 'mtty' device for testing
In-Reply-To: <20220719163356.337159-1-jjongsma@redhat.com>
References: <20220719163356.337159-1-jjongsma@redhat.com>
Message-ID: <01910db2-f2cc-1fb9-8e72-7ff5da433be6@redhat.com>

On 7/19/22 18:33, Jonathon Jongsma wrote:
> It would be nice to be able to test the mediated device capabilities
> without having physical hardware which supports it. The 'mtty' kernel
> module presents a virtual parent device which is capable of creating
> 'fake' mediated devices, and as such it would be useful for testing.
> 
> However, the 'mtty' device is not part of an existing device subsystem
> (e.g. PCI, etc), so libvirt ignores it and it does not get added to the
> node device list. And because it does not get added to the node device
> list, it cannot be used to create child mdevs using `virsh
> nodedev-create`.
> 
> There is already a node device type capability
> VIR_NODE_DEV_CAP_MDEV_TYPES that indicates whether a device supports
> creating child mediated devices, but libvirt assumes that this is a
> nested capability (in other words, it assumes that the primary
> capability of a device is something like PCI). If we allow this
> MDEV_TYPES capability to be a primary device capability, then we can
> support virtual devices like 'mtty' as a parent for mediated devices.
> 
> See https://bugzilla.redhat.com/show_bug.cgi?id=2107031
> 
> Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
> ---
>  src/conf/node_device_conf.c          | 41 +++++++++++++++++++++++++++-
>  src/conf/node_device_conf.h          | 13 +++++++++
>  src/libvirt_private.syms             |  2 ++
>  src/node_device/node_device_driver.c |  5 +++-
>  src/node_device/node_device_udev.c   | 25 +++++++++++++++++
>  src/util/virmdev.c                   | 28 +++++++++++++++++++
>  src/util/virmdev.h                   |  4 +++
>  7 files changed, 116 insertions(+), 2 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Wed Jul 20 12:52:34 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 14:52:34 +0200
Subject: [PATCH] hypervisor: domain_job: add and edit description
In-Reply-To: <4ecd6362ca5a94dd2cde4550a2710862aa2fed3a.1658234972.git.khanicov@redhat.com>
References: <4ecd6362ca5a94dd2cde4550a2710862aa2fed3a.1658234972.git.khanicov@redhat.com>
Message-ID: <1bcb98ee-3e6b-4362-6936-a978c2e699ab@redhat.com>

On 7/19/22 14:52, Kristina Hanicova wrote:
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/hypervisor/domain_job.c | 2 ++
>  src/hypervisor/domain_job.h | 5 ++++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From khanicov at redhat.com  Wed Jul 20 12:42:29 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 14:42:29 +0200
Subject: [PATCH] domain_conf: rewrite if else condition
Message-ID: <9291030ce4362808d702ee8fbde12a98c30ce8c2.1658320927.git.khanicov@redhat.com>

This patch prevents nesting of if conditions and makes the code
cleaner.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 50 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 44a01ab628..6b81c61056 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5309,18 +5309,18 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
 {
     g_autofree char *type = virXMLPropString(address, "type");
 
-    if (type) {
-        if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown address type '%s'"), type);
-            return -1;
-        }
-    } else {
+    if (!type) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        "%s", _("No type specified for device address"));
         return -1;
     }
 
+    if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("unknown address type '%s'"), type);
+        return -1;
+    }
+
     switch ((virDomainDeviceAddressType) info->type) {
     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
         if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0)
@@ -5996,20 +5996,20 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
      * <hostdev>.  (the functions we're going to call expect address
      * type to already be known).
      */
-    if (type) {
-        if ((def->source.subsys.type
-             = virDomainHostdevSubsysTypeFromString(type)) < 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown host device source address type '%s'"),
-                           type);
-            return -1;
-        }
-    } else {
+    if (!type) {
         virReportError(VIR_ERR_XML_ERROR,
                        "%s", _("missing source address type"));
         return -1;
     }
 
+    if ((def->source.subsys.type
+         = virDomainHostdevSubsysTypeFromString(type)) < 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("unknown host device source address type '%s'"),
+                       type);
+        return -1;
+    }
+
     if (!(sourcenode = virXPathNode("./source", ctxt))) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Missing <source> element in hostdev device"));
@@ -6304,20 +6304,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
      * <hostdev>.  (the functions we're going to call expect address
      * type to already be known).
      */
-    if (type) {
-        if ((def->source.caps.type
-             = virDomainHostdevCapsTypeFromString(type)) < 0) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("unknown host device source address type '%s'"),
-                           type);
-            return -1;
-        }
-    } else {
+    if (!type) {
         virReportError(VIR_ERR_XML_ERROR,
                        "%s", _("missing source address type"));
         return -1;
     }
 
+    if ((def->source.caps.type
+         = virDomainHostdevCapsTypeFromString(type)) < 0) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("unknown host device source address type '%s'"),
+                       type);
+        return -1;
+    }
+
     if (!virXPathNode("./source", ctxt)) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("Missing <source> element in hostdev device"));
-- 
2.35.3


From mprivozn at redhat.com  Wed Jul 20 12:52:39 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 14:52:39 +0200
Subject: [PATCH 0/5] hypervisor: move job object into hypervisor
In-Reply-To: <cover.1658237781.git.khanicov@redhat.com>
References: <cover.1658237781.git.khanicov@redhat.com>
Message-ID: <ff1a7a66-bdf2-f804-c0d9-1966dc8ddb83@redhat.com>

On 7/19/22 15:48, Kristina Hanicova wrote:
> This series moves generalized qemu job object into hypervisor/ and
> replaces all other hypervisor-specific job objects.
> 
> Kristina Hanicova (5):
>   qemu & hypervisor: move job object into hypervisor
>   hypervisor: domain_job: rename members in
>     virDomainObjPrivateJobCallbacks
>   LXC: use virDomainJobObj
>   libxl: use virDomainJobObj
>   CH: use virDomainJobObj
> 
>  src/ch/ch_domain.c               |  4 +-
>  src/ch/ch_domain.h               |  9 +----
>  src/hypervisor/domain_job.h      | 62 ++++++++++++++++++++++++++++++
>  src/libxl/libxl_domain.c         |  6 +--
>  src/libxl/libxl_domain.h         | 11 +-----
>  src/lxc/lxc_domain.c             |  4 +-
>  src/lxc/lxc_domain.h             |  9 +----
>  src/qemu/qemu_domain.c           | 10 ++---
>  src/qemu/qemu_domain.h           |  2 +-
>  src/qemu/qemu_domainjob.c        | 26 ++++++-------
>  src/qemu/qemu_domainjob.h        | 66 +++-----------------------------
>  src/qemu/qemu_migration.c        |  2 +-
>  src/qemu/qemu_migration.h        |  2 +-
>  src/qemu/qemu_migration_params.c |  2 +-
>  src/qemu/qemu_process.c          | 12 +++---
>  15 files changed, 106 insertions(+), 121 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From khanicov at redhat.com  Wed Jul 20 12:59:58 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 14:59:58 +0200
Subject: [PATCH] domain_conf: remove else after return / goto
Message-ID: <58c14ccfd4dc97be3930272f859e7e046d34e894.1658321985.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 44a01ab628..bc4b74c1c8 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption *xmlopt,
 
     if (domain->newDef)
         return domain->newDef;
-    else
-        return domain->def;
+
+    return domain->def;
 }
 
 
@@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
 
     if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
         return vm->newDef;
-    else
-        return vm->def;
+
+    return vm->def;
 }
 
 
@@ -6029,7 +6029,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
                              VIR_XML_PROP_NONZERO,
                              &scsisrc->sgio)) < 0) {
         return -1;
-    } else if (rv > 0) {
+    }
+
+    if (rv > 0) {
         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"));
@@ -6041,8 +6043,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
                                      VIR_XML_PROP_NONE,
                                      &scsisrc->rawio)) < 0) {
         return -1;
-    } else if (rv > 0 &&
-               def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
+    }
+
+    if (rv > 0 && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("rawio is only supported for scsi host device"));
         return -1;
@@ -8056,15 +8059,15 @@ virDomainControllerModelTypeFromString(const virDomainControllerDef *def,
 {
     if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
         return virDomainControllerModelSCSITypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
         return virDomainControllerModelUSBTypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
         return virDomainControllerModelPCITypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
         return virDomainControllerModelIDETypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
         return virDomainControllerModelVirtioSerialTypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
         return virDomainControllerModelISATypeFromString(model);
 
     return -1;
@@ -8077,15 +8080,15 @@ virDomainControllerModelTypeToString(virDomainControllerDef *def,
 {
     if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
         return virDomainControllerModelSCSITypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
         return virDomainControllerModelUSBTypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
         return virDomainControllerModelPCITypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
         return virDomainControllerModelIDETypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
         return virDomainControllerModelVirtioSerialTypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
+    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
         return virDomainControllerModelISATypeToString(model);
 
     return NULL;
@@ -9915,9 +9918,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
 
     ctxt->node = cur;
 
-    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0) {
+    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0)
         goto error;
-    } else if (nsources > 0) {
+
+    if (nsources > 0) {
         /* Parse only the first source element since only one is used
          * for chardev devices, the only exception is UDP type, where
          * user can specify two source elements. */
@@ -9926,7 +9930,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
                            _("only one source element is allowed for "
                              "character device"));
             goto error;
-        } else if (nsources > 2) {
+        }
+        if (nsources > 2) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("only two source elements are allowed for "
                              "character device"));
@@ -10006,9 +10011,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
         }
     }
 
-    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0) {
+    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0)
         goto error;
-    } else if (nlogs == 1) {
+
+    if (nlogs == 1) {
         if (virDomainChrSourceDefParseLog(def, logs[0]) < 0)
             goto error;
     } else if (nlogs > 1) {
@@ -10018,9 +10024,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
         goto error;
     }
 
-    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0) {
+    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0)
         goto error;
-    } else if (nprotocols == 1) {
+
+    if (nprotocols == 1) {
         if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0)
             goto error;
     } else if (nprotocols > 1) {
-- 
2.35.3


From mprivozn at redhat.com  Wed Jul 20 12:55:51 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 14:55:51 +0200
Subject: [PATCH] domain_conf: rewrite if else condition
In-Reply-To: <9291030ce4362808d702ee8fbde12a98c30ce8c2.1658320927.git.khanicov@redhat.com>
References: <9291030ce4362808d702ee8fbde12a98c30ce8c2.1658320927.git.khanicov@redhat.com>
Message-ID: <83ff22b4-e975-12ac-3858-61a086fcc929@redhat.com>

On 7/20/22 14:42, Kristina Hanicova wrote:
> This patch prevents nesting of if conditions and makes the code
> cleaner.
> 
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/conf/domain_conf.c | 50 +++++++++++++++++++++---------------------
>  1 file changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 44a01ab628..6b81c61056 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -5309,18 +5309,18 @@ virDomainDeviceAddressParseXML(xmlNodePtr address,
>  {
>      g_autofree char *type = virXMLPropString(address, "type");
>  
> -    if (type) {
> -        if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> -                           _("unknown address type '%s'"), type);
> -            return -1;
> -        }
> -    } else {
> +    if (!type) {
>          virReportError(VIR_ERR_INTERNAL_ERROR,
>                         "%s", _("No type specified for device address"));
>          return -1;
>      }
>  
> +    if ((info->type = virDomainDeviceAddressTypeFromString(type)) <= 0) {
> +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                       _("unknown address type '%s'"), type);
> +        return -1;
> +    }
> +
>      switch ((virDomainDeviceAddressType) info->type) {
>      case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
>          if (virPCIDeviceAddressParseXML(address, &info->addr.pci) < 0)
> @@ -5996,20 +5996,20 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
>       * <hostdev>.  (the functions we're going to call expect address
>       * type to already be known).
>       */
> -    if (type) {
> -        if ((def->source.subsys.type
> -             = virDomainHostdevSubsysTypeFromString(type)) < 0) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> -                           _("unknown host device source address type '%s'"),
> -                           type);
> -            return -1;
> -        }
> -    } else {
> +    if (!type) {
>          virReportError(VIR_ERR_XML_ERROR,
>                         "%s", _("missing source address type"));
>          return -1;
>      }
>  
> +    if ((def->source.subsys.type
> +         = virDomainHostdevSubsysTypeFromString(type)) < 0) {

Here, and ....

> +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                       _("unknown host device source address type '%s'"),
> +                       type);
> +        return -1;
> +    }
> +
>      if (!(sourcenode = virXPathNode("./source", ctxt))) {
>          virReportError(VIR_ERR_XML_ERROR, "%s",
>                         _("Missing <source> element in hostdev device"));
> @@ -6304,20 +6304,20 @@ virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED,
>       * <hostdev>.  (the functions we're going to call expect address
>       * type to already be known).
>       */
> -    if (type) {
> -        if ((def->source.caps.type
> -             = virDomainHostdevCapsTypeFromString(type)) < 0) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> -                           _("unknown host device source address type '%s'"),
> -                           type);
> -            return -1;
> -        }
> -    } else {
> +    if (!type) {
>          virReportError(VIR_ERR_XML_ERROR,
>                         "%s", _("missing source address type"));
>          return -1;
>      }
>  
> +    if ((def->source.caps.type
> +         = virDomainHostdevCapsTypeFromString(type)) < 0) {

.. here I'd rather have a slightly longer line than this. I'll fix that
before pushing.

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From khanicov at redhat.com  Wed Jul 20 13:11:03 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:03 +0200
Subject: [PATCH 0/9] domain_conf & domain_capabilities: small refactoring
Message-ID: <cover.1658322264.git.khanicov@redhat.com>

*** BLURB HERE ***

Kristina Hanicova (9):
  domain_capabilities: use early return in
    virDomainCapsFeatureSEVFormat()
  domain_capabilities: reformat virDomainCapsFeatureSEVFormat()
  domain_capabilities: reformat virDomainCapsCPUCustomFormat()
  domain_conf: remove breaks after return in
    virDomainChrSourceDefIsEqual()
  domain_conf: replace switch with if in virDomainChrDefFree()
  domain_conf: rewrite virDomainSoundCodecDefFree()
  domain_conf: use early return in virDomainObjAssignDef()
  domain_conf: rewrite conditions in virDomainObjWaitUntil()
  domain_conf: rewrite variable setting to ternary operator

 src/conf/domain_capabilities.c | 37 ++++++++-------
 src/conf/domain_conf.c         | 82 +++++++++++++++-------------------
 2 files changed, 53 insertions(+), 66 deletions(-)

-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:07 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:07 +0200
Subject: [PATCH 4/9] domain_conf: remove breaks after return in
 virDomainChrSourceDefIsEqual()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <e80f9e006fb225045f0ced3911235d4f69a90c54.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 26a241db38..b903dac1cb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2844,21 +2844,22 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
     case VIR_DOMAIN_CHR_TYPE_FILE:
         return src->data.file.append == tgt->data.file.append &&
             STREQ_NULLABLE(src->data.file.path, tgt->data.file.path);
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_PTY:
     case VIR_DOMAIN_CHR_TYPE_DEV:
     case VIR_DOMAIN_CHR_TYPE_PIPE:
         return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path);
+
     case VIR_DOMAIN_CHR_TYPE_NMDM:
         return STREQ_NULLABLE(src->data.nmdm.master, tgt->data.nmdm.master) &&
             STREQ_NULLABLE(src->data.nmdm.slave, tgt->data.nmdm.slave);
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_UDP:
         return STREQ_NULLABLE(src->data.udp.bindHost, tgt->data.udp.bindHost) &&
             STREQ_NULLABLE(src->data.udp.bindService, tgt->data.udp.bindService) &&
             STREQ_NULLABLE(src->data.udp.connectHost, tgt->data.udp.connectHost) &&
             STREQ_NULLABLE(src->data.udp.connectService, tgt->data.udp.connectService);
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_TCP:
         return src->data.tcp.listen == tgt->data.tcp.listen &&
             src->data.tcp.protocol == tgt->data.tcp.protocol &&
@@ -2866,18 +2867,16 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
             STREQ_NULLABLE(src->data.tcp.service, tgt->data.tcp.service) &&
             src->data.tcp.reconnect.enabled == tgt->data.tcp.reconnect.enabled &&
             src->data.tcp.reconnect.timeout == tgt->data.tcp.reconnect.timeout;
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_UNIX:
         return src->data.nix.listen == tgt->data.nix.listen &&
             STREQ_NULLABLE(src->data.nix.path, tgt->data.nix.path) &&
             src->data.nix.reconnect.enabled == tgt->data.nix.reconnect.enabled &&
             src->data.nix.reconnect.timeout == tgt->data.nix.reconnect.timeout;
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
         return STREQ_NULLABLE(src->data.spiceport.channel,
                               tgt->data.spiceport.channel);
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
         return src->data.spicevmc == tgt->data.spicevmc;
@@ -2885,12 +2884,10 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
     case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
         return src->data.qemuVdagent.clipboard == tgt->data.qemuVdagent.clipboard &&
             src->data.qemuVdagent.mouse == tgt->data.qemuVdagent.mouse;
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_DBUS:
         return STREQ_NULLABLE(src->data.dbus.channel,
                               tgt->data.dbus.channel);
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_NULL:
     case VIR_DOMAIN_CHR_TYPE_VC:
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:08 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:08 +0200
Subject: [PATCH 5/9] domain_conf: replace switch with if in
 virDomainChrDefFree()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <3b8128204eb71cad87e82361f57d34ac9fe5f5c3.1658322264.git.khanicov@redhat.com>

Switch is used for just one case, so I replaced it with a simple
if condition.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b903dac1cb..f51476c968 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2904,8 +2904,7 @@ void virDomainChrDefFree(virDomainChrDef *def)
     if (!def)
         return;
 
-    switch (def->deviceType) {
-    case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
+    if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) {
         switch (def->targetType) {
         case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
             g_free(def->target.addr);
@@ -2916,10 +2915,6 @@ void virDomainChrDefFree(virDomainChrDef *def)
             g_free(def->target.name);
             break;
         }
-        break;
-
-    default:
-        break;
     }
 
     virObjectUnref(def->source);
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:12 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:12 +0200
Subject: [PATCH 9/9] domain_conf: rewrite variable setting to ternary operator
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <b681ba62caf04365a4b0f48a19de0876db5bc8ea.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e52f39c809..b600bfec31 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4206,12 +4206,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
     if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
         return NULL;
 
-    if (live) {
-        if (flags & VIR_DOMAIN_AFFECT_LIVE)
-            *live = true;
-        else
-            *live = false;
-    }
+    if (live)
+        *live = (flags & VIR_DOMAIN_AFFECT_LIVE) ? true : false;
 
     if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
         return vm->newDef;
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:04 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:04 +0200
Subject: [PATCH 1/9] domain_capabilities: use early return in
 virDomainCapsFeatureSEVFormat()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <8aea3aa9386985fb3d239e4e3be2f4fae477dbef.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_capabilities.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 33570a51db..bb36a956db 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -590,25 +590,24 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
 {
     if (!sev) {
         virBufferAddLit(buf, "<sev supported='no'/>\n");
-    } else {
-        virBufferAddLit(buf, "<sev supported='yes'>\n");
-        virBufferAdjustIndent(buf, 2);
-        virBufferAsprintf(buf, "<cbitpos>%d</cbitpos>\n", sev->cbitpos);
-        virBufferAsprintf(buf, "<reducedPhysBits>%d</reducedPhysBits>\n",
-                          sev->reduced_phys_bits);
-        virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n",
-                          sev->max_guests);
-        virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n",
-                          sev->max_es_guests);
-        if (sev->cpu0_id != NULL) {
-            virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n",
-                              sev->cpu0_id);
-        }
-        virBufferAdjustIndent(buf, -2);
-        virBufferAddLit(buf, "</sev>\n");
+        return;
     }
 
-    return;
+    virBufferAddLit(buf, "<sev supported='yes'>\n");
+    virBufferAdjustIndent(buf, 2);
+    virBufferAsprintf(buf, "<cbitpos>%d</cbitpos>\n", sev->cbitpos);
+    virBufferAsprintf(buf, "<reducedPhysBits>%d</reducedPhysBits>\n",
+                      sev->reduced_phys_bits);
+    virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n",
+                      sev->max_guests);
+    virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n",
+                      sev->max_es_guests);
+    if (sev->cpu0_id != NULL) {
+        virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n",
+                          sev->cpu0_id);
+    }
+    virBufferAdjustIndent(buf, -2);
+    virBufferAddLit(buf, "</sev>\n");
 }
 
 
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:06 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:06 +0200
Subject: [PATCH 3/9] domain_capabilities: reformat
 virDomainCapsCPUCustomFormat()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <91022deb3d8feed61ddc5ec03c9ce302541222a4.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_capabilities.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 6e8f957657..653123f293 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -376,12 +376,14 @@ virDomainCapsCPUCustomFormat(virBuffer *buf,
 
     for (i = 0; i < custom->nmodels; i++) {
         virDomainCapsCPUModel *model = custom->models + i;
+
         virBufferAsprintf(buf, "<model usable='%s'",
                           virDomainCapsCPUUsableTypeToString(model->usable));
+
         if (model->deprecated)
             virBufferAddLit(buf, " deprecated='yes'");
-        virBufferAsprintf(buf, ">%s</model>\n",
-                          model->name);
+
+        virBufferAsprintf(buf, ">%s</model>\n", model->name);
     }
 
     virBufferAdjustIndent(buf, -2);
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:09 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:09 +0200
Subject: [PATCH 6/9] domain_conf: rewrite virDomainSoundCodecDefFree()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <ca8772177ba5ffa102155a05624a4ed78cede1b1.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f51476c968..88d50d27f5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2955,10 +2955,8 @@ void virDomainSmartcardDefFree(virDomainSmartcardDef *def)
 
 void virDomainSoundCodecDefFree(virDomainSoundCodecDef *def)
 {
-    if (!def)
-        return;
-
-    g_free(def);
+    if (def)
+        g_free(def);
 }
 
 void virDomainSoundDefFree(virDomainSoundDef *def)
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:10 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:10 +0200
Subject: [PATCH 7/9] domain_conf: use early return in virDomainObjAssignDef()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <605a1b3f4da6bfb8ff45ddc9a99a02902a16b623.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 88d50d27f5..1c29a2d929 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3918,22 +3918,24 @@ void virDomainObjAssignDef(virDomainObj *domain,
         else
             virDomainDefFree(domain->newDef);
         domain->newDef = g_steal_pointer(def);
-    } else {
-        if (live) {
-            /* save current configuration to be restored on domain shutdown */
-            if (!domain->newDef)
-                domain->newDef = domain->def;
-            else
-                virDomainDefFree(domain->def);
-            domain->def = g_steal_pointer(def);
-        } else {
-            if (oldDef)
-                *oldDef = domain->def;
-            else
-                virDomainDefFree(domain->def);
-            domain->def = g_steal_pointer(def);
-        }
+        return;
+    }
+
+    if (live) {
+        /* save current configuration to be restored on domain shutdown */
+        if (!domain->newDef)
+            domain->newDef = domain->def;
+        else
+            virDomainDefFree(domain->def);
+        domain->def = g_steal_pointer(def);
+        return;
     }
+
+    if (oldDef)
+        *oldDef = domain->def;
+    else
+        virDomainDefFree(domain->def);
+    domain->def = g_steal_pointer(def);
 }
 
 
-- 
2.35.3


From mprivozn at redhat.com  Wed Jul 20 13:00:09 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 15:00:09 +0200
Subject: [PATCH] schemas: Update ref acpi for devices
In-Reply-To: <20220719070220.1356681-1-hhan@redhat.com>
References: <20220719070220.1356681-1-hhan@redhat.com>
Message-ID: <5e71606a-c3cf-5d73-9b51-1d6c9220d8a6@redhat.com>

On 7/19/22 09:02, Han Han wrote:
> According to a9fe9569ab, the <acpi index='NNN'/> is only for PCI
> devices. Remove the ref acpi from devices channel, smartcard, tpm,
> redirdev, panic, hub because none of them has PCI address. And add the
> ref acpi to iommu device.
> 
> Fixes: a9fe9569ab
> 
> Signed-off-by: Han Han <hhan at redhat.com>
> ---
>  src/conf/schemas/domaincommon.rng | 21 +++------------------
>  1 file changed, 3 insertions(+), 18 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Wed Jul 20 12:52:30 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 14:52:30 +0200
Subject: [PATCH] qemu: domainjob: remove async variable from
 qemuDomainObjBeginJobInternal()
In-Reply-To: <04336084729f064571c4098d47f627ad5c3abc72.1658234676.git.khanicov@redhat.com>
References: <04336084729f064571c4098d47f627ad5c3abc72.1658234676.git.khanicov@redhat.com>
Message-ID: <653e80f0-63dc-02f9-8382-a44a49bc5d2f@redhat.com>

On 7/19/22 14:47, Kristina Hanicova wrote:
> This patch removes variable 'async', which is used only once, and
> replaces it with direct comparison with an enum member.
> 
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/qemu/qemu_domainjob.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From khanicov at redhat.com  Wed Jul 20 13:11:05 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:05 +0200
Subject: [PATCH 2/9] domain_capabilities: reformat
 virDomainCapsFeatureSEVFormat()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <bc75ec82d886525dab264d12f0679c069ca24a5a.1658322264.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_capabilities.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index bb36a956db..6e8f957657 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -598,14 +598,12 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
     virBufferAsprintf(buf, "<cbitpos>%d</cbitpos>\n", sev->cbitpos);
     virBufferAsprintf(buf, "<reducedPhysBits>%d</reducedPhysBits>\n",
                       sev->reduced_phys_bits);
-    virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n",
-                      sev->max_guests);
-    virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n",
-                      sev->max_es_guests);
-    if (sev->cpu0_id != NULL) {
-        virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n",
-                          sev->cpu0_id);
-    }
+    virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n", sev->max_guests);
+    virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n", sev->max_es_guests);
+
+    if (sev->cpu0_id != NULL)
+        virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n", sev->cpu0_id);
+
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</sev>\n");
 }
-- 
2.35.3


From khanicov at redhat.com  Wed Jul 20 13:11:11 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 15:11:11 +0200
Subject: [PATCH 8/9] domain_conf: rewrite conditions in virDomainObjWaitUntil()
In-Reply-To: <cover.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
Message-ID: <0892e8f93ec408bab448571c3bc70e66098fd81a.1658322264.git.khanicov@redhat.com>

This patch rewrites conditions to make the code easier and less
structured.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 1c29a2d929..e52f39c809 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3999,15 +3999,15 @@ int
 virDomainObjWaitUntil(virDomainObj *vm,
                       unsigned long long whenms)
 {
-    if (virCondWaitUntil(&vm->cond, &vm->parent.lock, whenms) < 0) {
-        if (errno != ETIMEDOUT) {
-            virReportSystemError(errno, "%s",
-                                 _("failed to wait for domain condition"));
-            return -1;
-        }
+    if (virCondWaitUntil(&vm->cond, &vm->parent.lock, whenms) >= 0)
+        return 0;
+
+    if (errno == ETIMEDOUT)
         return 1;
-    }
-    return 0;
+
+    virReportSystemError(errno, "%s",
+                         _("failed to wait for domain condition"));
+    return -1;
 }
 
 
-- 
2.35.3


From berrange at redhat.com  Wed Jul 20 13:34:03 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 20 Jul 2022 14:34:03 +0100
Subject: [PATCH] domain_conf: remove else after return / goto
In-Reply-To: <58c14ccfd4dc97be3930272f859e7e046d34e894.1658321985.git.khanicov@redhat.com>
References: <58c14ccfd4dc97be3930272f859e7e046d34e894.1658321985.git.khanicov@redhat.com>
Message-ID: <YtgES+Y9YNwfdfkq@redhat.com>


What's the reasoning for making this change ?

On Wed, Jul 20, 2022 at 02:59:58PM +0200, Kristina Hanicova wrote:
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------
>  1 file changed, 31 insertions(+), 24 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index 44a01ab628..bc4b74c1c8 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption *xmlopt,
>  
>      if (domain->newDef)
>          return domain->newDef;
> -    else
> -        return domain->def;
> +
> +    return domain->def;
>  }
> @@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
>  
>      if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
>          return vm->newDef;
> -    else
> -        return vm->def;
> +
> +    return vm->def;
>  }


I'm not really convinced these two changes are better.

>  
>  
> @@ -6029,7 +6029,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
>                               VIR_XML_PROP_NONZERO,
>                               &scsisrc->sgio)) < 0) {
>          return -1;
> -    } else if (rv > 0) {
> +    }
> +
> +    if (rv > 0) {
>          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"));
> @@ -6041,8 +6043,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
>                                       VIR_XML_PROP_NONE,
>                                       &scsisrc->rawio)) < 0) {
>          return -1;
> -    } else if (rv > 0 &&
> -               def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
> +    }
> +
> +    if (rv > 0 && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
>          virReportError(VIR_ERR_XML_ERROR, "%s",
>                         _("rawio is only supported for scsi host device"));
>          return -1;


I don't mind eliminating the else, when the first 'if' is just an
error return/goto case.

> @@ -8056,15 +8059,15 @@ virDomainControllerModelTypeFromString(const virDomainControllerDef *def,
>  {
>      if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
>          return virDomainControllerModelSCSITypeFromString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
>          return virDomainControllerModelUSBTypeFromString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
>          return virDomainControllerModelPCITypeFromString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
>          return virDomainControllerModelIDETypeFromString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
>          return virDomainControllerModelVirtioSerialTypeFromString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
>          return virDomainControllerModelISATypeFromString(model);

This giant if/else should be a switch instead

>  
>      return -1;
> @@ -8077,15 +8080,15 @@ virDomainControllerModelTypeToString(virDomainControllerDef *def,
>  {
>      if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
>          return virDomainControllerModelSCSITypeToString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
>          return virDomainControllerModelUSBTypeToString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
>          return virDomainControllerModelPCITypeToString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
>          return virDomainControllerModelIDETypeToString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
>          return virDomainControllerModelVirtioSerialTypeToString(model);
> -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
> +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
>          return virDomainControllerModelISATypeToString(model);

Likewise a switch.

>  
>      return NULL;
> @@ -9915,9 +9918,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
>  
>      ctxt->node = cur;
>  
> -    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0) {
> +    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0)
>          goto error;
> -    } else if (nsources > 0) {
> +
> +    if (nsources > 0) {
>          /* Parse only the first source element since only one is used
>           * for chardev devices, the only exception is UDP type, where
>           * user can specify two source elements. */
> @@ -9926,7 +9930,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
>                             _("only one source element is allowed for "
>                               "character device"));
>              goto error;
> -        } else if (nsources > 2) {
> +        }
> +        if (nsources > 2) {
>              virReportError(VIR_ERR_XML_ERROR, "%s",
>                             _("only two source elements are allowed for "
>                               "character device"));
> @@ -10006,9 +10011,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
>          }
>      }
>  
> -    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0) {
> +    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0)
>          goto error;
> -    } else if (nlogs == 1) {
> +
> +    if (nlogs == 1) {
>          if (virDomainChrSourceDefParseLog(def, logs[0]) < 0)
>              goto error;
>      } else if (nlogs > 1) {
> @@ -10018,9 +10024,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
>          goto error;
>      }
>  
> -    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0) {
> +    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0)
>          goto error;
> -    } else if (nprotocols == 1) {
> +
> +    if (nprotocols == 1) {
>          if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0)
>              goto error;
>      } else if (nprotocols > 1) {


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From berrange at redhat.com  Wed Jul 20 13:36:16 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Wed, 20 Jul 2022 14:36:16 +0100
Subject: [PATCH 6/9] domain_conf: rewrite virDomainSoundCodecDefFree()
In-Reply-To: <ca8772177ba5ffa102155a05624a4ed78cede1b1.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
 <ca8772177ba5ffa102155a05624a4ed78cede1b1.1658322264.git.khanicov@redhat.com>
Message-ID: <YtgE0NB7F7pY5nIs@redhat.com>

On Wed, Jul 20, 2022 at 03:11:09PM +0200, Kristina Hanicova wrote:
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/conf/domain_conf.c | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index f51476c968..88d50d27f5 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -2955,10 +2955,8 @@ void virDomainSmartcardDefFree(virDomainSmartcardDef *def)
>  
>  void virDomainSoundCodecDefFree(virDomainSoundCodecDef *def)
>  {
> -    if (!def)
> -        return;
> -
> -    g_free(def);
> +    if (def)
> +        g_free(def);
>  }

This is not desirable - our default pattern for Free() funcs is
to return immediately if NULL. At a later date other statements
may end up being added in the middle of this existing function,
which would involve then reverting this proposed change.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From pkrempa at redhat.com  Wed Jul 20 13:44:19 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 20 Jul 2022 15:44:19 +0200
Subject: [PATCH 5/9] domain_conf: replace switch with if in
 virDomainChrDefFree()
In-Reply-To: <3b8128204eb71cad87e82361f57d34ac9fe5f5c3.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
 <3b8128204eb71cad87e82361f57d34ac9fe5f5c3.1658322264.git.khanicov@redhat.com>
Message-ID: <YtgGs+rR0dPfNj6U@angien.pipo.sk>

On Wed, Jul 20, 2022 at 15:11:08 +0200, Kristina Hanicova wrote:
> Switch is used for just one case, so I replaced it with a simple
> if condition.
> 
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/conf/domain_conf.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index b903dac1cb..f51476c968 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -2904,8 +2904,7 @@ void virDomainChrDefFree(virDomainChrDef *def)
>      if (!def)
>          return;
>  
> -    switch (def->deviceType) {

Alternatively a more future proof (but more verbose) approach which we
are doing in many places is to use the proper type (either by fixing the
struct to use proper type, or typecasting) in the switch expression and 
then simply enumerate all values.

That way any further addition doesn't have to un-do this patch.

> -    case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
> +    if (def->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL) {
>          switch (def->targetType) {
>          case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
>              g_free(def->target.addr);
> @@ -2916,10 +2915,6 @@ void virDomainChrDefFree(virDomainChrDef *def)
>              g_free(def->target.name);
>              break;
>          }
> -        break;
> -
> -    default:
> -        break;
>      }
>  
>      virObjectUnref(def->source);
> -- 
> 2.35.3
> 

From jdenemar at redhat.com  Wed Jul 20 13:54:15 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 15:54:15 +0200
Subject: [libvirt PATCH v3 1/4] qemu: introduce capability
 QEMU_CAPS_MIGRATION_BLOCKED_REASONS
In-Reply-To: <20220720121558.3150209-2-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-2-eperezma@redhat.com>
Message-ID: <YtgJB1jIyaAqJ934@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 14:15:55 +0200, Eugenio P?rez wrote:
> From: Jonathon Jongsma <jjongsma at redhat.com>
> 
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
> v3: s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/
> ---
>  src/qemu/qemu_capabilities.c                      | 2 ++
>  src/qemu/qemu_capabilities.h                      | 1 +
>  tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
>  tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 +
>  tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
>  tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
>  tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
>  tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 +
>  tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
>  tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
>  tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
>  tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
>  tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
>  13 files changed, 14 insertions(+)

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

From pkrempa at redhat.com  Wed Jul 20 13:40:56 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 20 Jul 2022 15:40:56 +0200
Subject: [PATCH 9/9] domain_conf: rewrite variable setting to ternary
 operator
In-Reply-To: <b681ba62caf04365a4b0f48a19de0876db5bc8ea.1658322264.git.khanicov@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
 <b681ba62caf04365a4b0f48a19de0876db5bc8ea.1658322264.git.khanicov@redhat.com>
Message-ID: <YtgF6MF272bkkLk/@angien.pipo.sk>

On Wed, Jul 20, 2022 at 15:11:12 +0200, Kristina Hanicova wrote:
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/conf/domain_conf.c | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index e52f39c809..b600bfec31 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -4206,12 +4206,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
>      if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
>          return NULL;
>  
> -    if (live) {
> -        if (flags & VIR_DOMAIN_AFFECT_LIVE)
> -            *live = true;
> -        else
> -            *live = false;
> -    }
> +    if (live)
> +        *live = (flags & VIR_DOMAIN_AFFECT_LIVE) ? true : false;
>  

https://libvirt.org/coding-style.html#conditional-expressions

We suggest that new code avoids ternary operators.

I'd prefer if this patch is dropped.

From jdenemar at redhat.com  Wed Jul 20 13:58:02 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 15:58:02 +0200
Subject: [libvirt PATCH v3 2/4] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <20220720121558.3150209-3-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-3-eperezma@redhat.com>
Message-ID: <YtgJ6mLa1tF/qNYG@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 14:15:56 +0200, Eugenio P?rez wrote:
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Enable qemu monitor to send this query.  This will allow
> qemuMigrationSrcIsAllowed to dynamically ask for migration blockers,
> reducing duplication.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
> v3:
> * Squash some patches
> * Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
>   blockers.
> * Move note to function doc.
> ---
>  src/qemu/qemu_monitor.c      | 11 +++++++++
>  src/qemu/qemu_monitor.h      |  4 ++++
>  src/qemu/qemu_monitor_json.c | 43 ++++++++++++++++++++++++++++++++++++
>  src/qemu/qemu_monitor_json.h |  3 +++
>  4 files changed, 61 insertions(+)
> 
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index 109107eaae..e0939beecd 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -4486,3 +4486,14 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
>  
>      return qemuMonitorJSONMigrateRecover(mon, uri);
>  }
> +
> +int
> +qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
> +                                char ***blockers)
> +{
> +    VIR_DEBUG("blockers=%p", blockers);
> +
> +    QEMU_CHECK_MONITOR(mon);
> +
> +    return qemuMonitorJSONGetMigrationBlockers(mon, blockers);
> +}
> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
> index cc1a0bc8c9..b82f198285 100644
> --- a/src/qemu/qemu_monitor.h
> +++ b/src/qemu/qemu_monitor.h
> @@ -1543,3 +1543,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
>  int
>  qemuMonitorMigrateRecover(qemuMonitor *mon,
>                            const char *uri);
> +
> +int
> +qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
> +                                char ***blockers);
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 5e4a86e5ad..6d15a458a3 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -3338,6 +3338,49 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
>      return 0;
>  }
>  
> +/*
> + * Get the exposed migration blockers.
> + *
> + * This function assume qemu has the capability of request them.
> + *
> + * It returns a NULL terminated array on blockers if there are any, or it set
> + * it to NULL otherwise.
> + */
> +int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,

I'm sorry for not noticing this in v2, but the return type should be on
a separate line (yeah, I know the three functions around the place you
put yours do not follow this).

I can change it before pushing to avoid trivial v4 if you don't mind.

With the change
Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

From khanicov at redhat.com  Wed Jul 20 14:00:56 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 16:00:56 +0200
Subject: [PATCH] domain_conf: remove else after return / goto
In-Reply-To: <YtgES+Y9YNwfdfkq@redhat.com>
References: <58c14ccfd4dc97be3930272f859e7e046d34e894.1658321985.git.khanicov@redhat.com>
 <YtgES+Y9YNwfdfkq@redhat.com>
Message-ID: <CAJEdO+08N4zms6BZj7wCGnfYYwL7qJz6pBsZC51HTQQ2CEqgDQ@mail.gmail.com>

On Wed, Jul 20, 2022 at 3:34 PM Daniel P. Berrang? <berrange at redhat.com>
wrote:

>
> What's the reasoning for making this change ?
>

I stumbled upon this and decided to rewrite code in src/conf/ that could be
easily improved.


>
> On Wed, Jul 20, 2022 at 02:59:58PM +0200, Kristina Hanicova wrote:
> > Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> > ---
> >  src/conf/domain_conf.c | 55 ++++++++++++++++++++++++------------------
> >  1 file changed, 31 insertions(+), 24 deletions(-)
> >
> > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> > index 44a01ab628..bc4b74c1c8 100644
> > --- a/src/conf/domain_conf.c
> > +++ b/src/conf/domain_conf.c
> > @@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption
> *xmlopt,
> >
> >      if (domain->newDef)
> >          return domain->newDef;
> > -    else
> > -        return domain->def;
> > +
> > +    return domain->def;
> >  }
> > @@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
> >
> >      if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
> >          return vm->newDef;
> > -    else
> > -        return vm->def;
> > +
> > +    return vm->def;
> >  }
>
>
> I'm not really convinced these two changes are better.
>

Well, the else after return is redundant because it will never reach the
'else' branch if the condition is true.

I think this looks cleaner and is more readable, because having 'else'
branch indicates to me that no return / break / goto is in the previous
branch and the funcion can reach it.


>
> >
> >
> > @@ -6029,7 +6029,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
> >                               VIR_XML_PROP_NONZERO,
> >                               &scsisrc->sgio)) < 0) {
> >          return -1;
> > -    } else if (rv > 0) {
> > +    }
> > +
> > +    if (rv > 0) {
> >          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"));
> > @@ -6041,8 +6043,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
> >                                       VIR_XML_PROP_NONE,
> >                                       &scsisrc->rawio)) < 0) {
> >          return -1;
> > -    } else if (rv > 0 &&
> > -               def->source.subsys.type !=
> VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
> > +    }
> > +
> > +    if (rv > 0 && def->source.subsys.type !=
> VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
> >          virReportError(VIR_ERR_XML_ERROR, "%s",
> >                         _("rawio is only supported for scsi host
> device"));
> >          return -1;
>
>
> I don't mind eliminating the else, when the first 'if' is just an
> error return/goto case.
>
> > @@ -8056,15 +8059,15 @@ virDomainControllerModelTypeFromString(const
> virDomainControllerDef *def,
> >  {
> >      if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
> >          return virDomainControllerModelSCSITypeFromString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
> >          return virDomainControllerModelUSBTypeFromString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
> >          return virDomainControllerModelPCITypeFromString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
> >          return virDomainControllerModelIDETypeFromString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
> >          return
> virDomainControllerModelVirtioSerialTypeFromString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
> >          return virDomainControllerModelISATypeFromString(model);
>
> This giant if/else should be a switch instead
>

Thanks, way better idea.


>
> >
> >      return -1;
> > @@ -8077,15 +8080,15 @@
> virDomainControllerModelTypeToString(virDomainControllerDef *def,
> >  {
> >      if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
> >          return virDomainControllerModelSCSITypeToString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
> >          return virDomainControllerModelUSBTypeToString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
> >          return virDomainControllerModelPCITypeToString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
> >          return virDomainControllerModelIDETypeToString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
> >          return virDomainControllerModelVirtioSerialTypeToString(model);
> > -    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
> > +    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
> >          return virDomainControllerModelISATypeToString(model);
>
> Likewise a switch.
>
> >
> >      return NULL;
> > @@ -9915,9 +9918,10 @@
> virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
> >
> >      ctxt->node = cur;
> >
> > -    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0) {
> > +    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0)
> >          goto error;
> > -    } else if (nsources > 0) {
> > +
> > +    if (nsources > 0) {
> >          /* Parse only the first source element since only one is used
> >           * for chardev devices, the only exception is UDP type, where
> >           * user can specify two source elements. */
> > @@ -9926,7 +9930,8 @@
> virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
> >                             _("only one source element is allowed for "
> >                               "character device"));
> >              goto error;
> > -        } else if (nsources > 2) {
> > +        }
> > +        if (nsources > 2) {
> >              virReportError(VIR_ERR_XML_ERROR, "%s",
> >                             _("only two source elements are allowed for "
> >                               "character device"));
> > @@ -10006,9 +10011,10 @@
> virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
> >          }
> >      }
> >
> > -    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0) {
> > +    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0)
> >          goto error;
> > -    } else if (nlogs == 1) {
> > +
> > +    if (nlogs == 1) {
> >          if (virDomainChrSourceDefParseLog(def, logs[0]) < 0)
> >              goto error;
> >      } else if (nlogs > 1) {
> > @@ -10018,9 +10024,10 @@
> virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
> >          goto error;
> >      }
> >
> > -    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols))
> < 0) {
> > +    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols))
> < 0)
> >          goto error;
> > -    } else if (nprotocols == 1) {
> > +
> > +    if (nprotocols == 1) {
> >          if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0)
> >              goto error;
> >      } else if (nprotocols > 1) {
>
>
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-
> https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|
>
>

Regards,
Kristina
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220720/6ea8e8c2/attachment-0001.htm>

From jdenemar at redhat.com  Wed Jul 20 14:02:44 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 16:02:44 +0200
Subject: [libvirt PATCH v3 4/4] qemu_migration: Do not forbid vDPA
 devices if can query blockers
In-Reply-To: <20220720121558.3150209-5-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-5-eperezma@redhat.com>
Message-ID: <YtgLBLP9/MfACPAg@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 14:15:58 +0200, Eugenio P?rez wrote:
> vDPA devices will be migratable soon. Since they are not migratable
> before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> for migration blockers, let it hardcoded in that case.
> 
> Otherwise, ask qemu about the explicit blocker.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
> v3: Fix indentation
> ---
>  src/qemu/qemu_migration.c | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 6ac4ef150b..45e16242f0 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>      int pauseReason;
>      size_t i;
>      int r;
> +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> +                                            QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
>  
>      /* Ask qemu if it have a migration blocker */
> -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> +    if (blockedReasonsCap) {
>          g_auto(GStrv) blockers = NULL;
>          r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
>          if (r != 0) {
> @@ -1467,7 +1469,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>          }
>  
>          if (blockers && blockers[0]) {
> -            g_autofree char *reasons = g_strjoinv(", ", blockers);
> +            g_autofree char *reasons = g_strjoinv("; ", blockers);
>              virReportError(VIR_ERR_OPERATION_INVALID,
>                             _("cannot migrate domain: %s"), reasons);
>              return false;

This hunk should be squashed into the previous patch.

> @@ -1580,7 +1582,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>              virDomainNetDef *net = vm->def->nets[i];
>              qemuSlirp *slirp;
>  
> -            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
> +            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
>                  virReportError(VIR_ERR_OPERATION_INVALID, "%s",
>                                 _("vDPA devices cannot be migrated"));
>                  return false;

With that change

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

From jdenemar at redhat.com  Wed Jul 20 14:01:43 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 16:01:43 +0200
Subject: [libvirt PATCH v3 3/4] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <20220720121558.3150209-4-eperezma@redhat.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-4-eperezma@redhat.com>
Message-ID: <YtgKx/xJZQO8rznx@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 14:15:57 +0200, Eugenio P?rez wrote:
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Enable qemuMigrationSrcIsAllowed to query it.
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> ---
> v3:
> * Report message with a colon.
> * Report all blockers instead of only the first.
> ---
>  src/qemu/qemu_migration.c | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index b12cb518ee..6ac4ef150b 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
>      return true;
>  }
>  
> +static int
> +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> +                               virDomainObj *vm,
> +                               char ***blockers)
> +{
> +    qemuDomainObjPrivate *priv = vm->privateData;
> +    int rc;
> +
> +    qemuDomainObjEnterMonitor(driver, vm);
> +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> +    qemuDomainObjExitMonitor(vm);
> +
> +    return rc;
> +}
>  
>  /**
>   * qemuMigrationSrcIsAllowed:
> @@ -1439,6 +1453,26 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>      int nsnapshots;
>      int pauseReason;
>      size_t i;
> +    int r;
> +
> +    /* Ask qemu if it have a migration blocker */
> +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> +        g_auto(GStrv) blockers = NULL;
> +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> +        if (r != 0) {
> +            virReportError(VIR_ERR_OPERATION_INVALID,
> +                           _("cannot migrate domain: %s"),
> +                           _("error getting blockers"));
> +            return false;
> +        }

As mentioned in v2 review the virReportError call should be dropped as
it overwrites the error reported by qemuDomainGetMigrationBlockers. That
is, you can just

    if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
        return false;

> +
> +        if (blockers && blockers[0]) {
> +            g_autofree char *reasons = g_strjoinv(", ", blockers);

In the following patch you change ", " to "; ". I don't mind that much
either way, but it should be done in this patch :-)

> +            virReportError(VIR_ERR_OPERATION_INVALID,
> +                           _("cannot migrate domain: %s"), reasons);
> +            return false;
> +        }
> +    }
>  
>      /* perform these checks only when migrating to remote hosts */
>      if (remote) {

Hmm, easy but not trivial changes so I guess v4 would be better.

Jirka

From khanicov at redhat.com  Wed Jul 20 14:12:21 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Wed, 20 Jul 2022 16:12:21 +0200
Subject: [PATCH 9/9] domain_conf: rewrite variable setting to ternary
 operator
In-Reply-To: <YtgF6MF272bkkLk/@angien.pipo.sk>
References: <cover.1658322264.git.khanicov@redhat.com>
 <b681ba62caf04365a4b0f48a19de0876db5bc8ea.1658322264.git.khanicov@redhat.com>
 <YtgF6MF272bkkLk/@angien.pipo.sk>
Message-ID: <CAJEdO+1HZFfpoScq0bEhSZO9ixrh=kcT5Hn7QNdbDRPZKQTMdQ@mail.gmail.com>

On Wed, Jul 20, 2022 at 3:41 PM Peter Krempa <pkrempa at redhat.com> wrote:

> On Wed, Jul 20, 2022 at 15:11:12 +0200, Kristina Hanicova wrote:
> > Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> > ---
> >  src/conf/domain_conf.c | 8 ++------
> >  1 file changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> > index e52f39c809..b600bfec31 100644
> > --- a/src/conf/domain_conf.c
> > +++ b/src/conf/domain_conf.c
> > @@ -4206,12 +4206,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
> >      if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
> >          return NULL;
> >
> > -    if (live) {
> > -        if (flags & VIR_DOMAIN_AFFECT_LIVE)
> > -            *live = true;
> > -        else
> > -            *live = false;
> > -    }
> > +    if (live)
> > +        *live = (flags & VIR_DOMAIN_AFFECT_LIVE) ? true : false;
> >
>
> https://libvirt.org/coding-style.html#conditional-expressions
>
> We suggest that new code avoids ternary operators.
>
> I'd prefer if this patch is dropped.
>
>
I think that it is reasonably used in this case and makes the code much
more readable. Also its simple enough, no nesting or spanning more lines....


Kristina
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220720/3e53e22a/attachment.htm>

From eperezma at redhat.com  Wed Jul 20 14:18:16 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 16:18:16 +0200
Subject: [libvirt PATCH v3 2/4] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <YtgJ6mLa1tF/qNYG@orkuz.int.mamuti.net>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-3-eperezma@redhat.com>
 <YtgJ6mLa1tF/qNYG@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWfHjk_Ca-gsetfZf7=vHPzPDXYgSxuub43yXSp_zQha_g@mail.gmail.com>

On Wed, Jul 20, 2022 at 3:58 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 14:15:56 +0200, Eugenio P?rez wrote:
> > since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> > will return an array of error strings describing the migration blockers.
> > This can be used to check whether there are any devices blocking
> > migration, etc.
> >
> > Enable qemu monitor to send this query.  This will allow
> > qemuMigrationSrcIsAllowed to dynamically ask for migration blockers,
> > reducing duplication.
> >
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> > v3:
> > * Squash some patches
> > * Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
> >   blockers.
> > * Move note to function doc.
> > ---
> >  src/qemu/qemu_monitor.c      | 11 +++++++++
> >  src/qemu/qemu_monitor.h      |  4 ++++
> >  src/qemu/qemu_monitor_json.c | 43 ++++++++++++++++++++++++++++++++++++
> >  src/qemu/qemu_monitor_json.h |  3 +++
> >  4 files changed, 61 insertions(+)
> >
> > diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> > index 109107eaae..e0939beecd 100644
> > --- a/src/qemu/qemu_monitor.c
> > +++ b/src/qemu/qemu_monitor.c
> > @@ -4486,3 +4486,14 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
> >
> >      return qemuMonitorJSONMigrateRecover(mon, uri);
> >  }
> > +
> > +int
> > +qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
> > +                                char ***blockers)
> > +{
> > +    VIR_DEBUG("blockers=%p", blockers);
> > +
> > +    QEMU_CHECK_MONITOR(mon);
> > +
> > +    return qemuMonitorJSONGetMigrationBlockers(mon, blockers);
> > +}
> > diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
> > index cc1a0bc8c9..b82f198285 100644
> > --- a/src/qemu/qemu_monitor.h
> > +++ b/src/qemu/qemu_monitor.h
> > @@ -1543,3 +1543,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
> >  int
> >  qemuMonitorMigrateRecover(qemuMonitor *mon,
> >                            const char *uri);
> > +
> > +int
> > +qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
> > +                                char ***blockers);
> > diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> > index 5e4a86e5ad..6d15a458a3 100644
> > --- a/src/qemu/qemu_monitor_json.c
> > +++ b/src/qemu/qemu_monitor_json.c
> > @@ -3338,6 +3338,49 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
> >      return 0;
> >  }
> >
> > +/*
> > + * Get the exposed migration blockers.
> > + *
> > + * This function assume qemu has the capability of request them.
> > + *
> > + * It returns a NULL terminated array on blockers if there are any, or it set
> > + * it to NULL otherwise.
> > + */
> > +int qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
>
> I'm sorry for not noticing this in v2, but the return type should be on
> a separate line (yeah, I know the three functions around the place you
> put yours do not follow this).
>

I'll send a new version with this.

> I can change it before pushing to avoid trivial v4 if you don't mind.
>
> With the change
> Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
>


From jfehlig at suse.com  Wed Jul 20 14:12:12 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Wed, 20 Jul 2022 08:12:12 -0600
Subject: [PATCH] spec: Remove duplicate check of libvirtd status
Message-ID: <20220720141212.3544-1-jfehlig@suse.com>

The %posttrans scriptlet checks if libvirtd is active within a
condition that is only executed if libvirtd is active. Remove the
duplicate check.

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---

This patch contains an improvement Martin suggested while reviewing
another patch to the posttrans scriptlet

https://listman.redhat.com/archives/libvir-list/2022-July/232947.html

The problem of not restarting socket units if libvird is inactive persists,
but it is not clear if socket units need restarted on package update.

 libvirt.spec.in | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 9d788b790f..a238edf2aa 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1365,18 +1365,12 @@ then
         # 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 \
-                    libvirtd-ro.socket \
-                    libvirtd-admin.socket >/dev/null 2>&1 || :
-
-            /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
-        fi
+        /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
+        /bin/systemctl try-restart \
+                libvirtd.socket \
+                libvirtd-ro.socket \
+                libvirtd-admin.socket >/dev/null 2>&1 || :
+        /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
     fi
 fi
 
-- 
2.36.1


From eperezma at redhat.com  Wed Jul 20 14:17:26 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 16:17:26 +0200
Subject: [libvirt PATCH v3 4/4] qemu_migration: Do not forbid vDPA devices
 if can query blockers
In-Reply-To: <YtgLBLP9/MfACPAg@orkuz.int.mamuti.net>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-5-eperezma@redhat.com>
 <YtgLBLP9/MfACPAg@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWeytAuyoe_KRE3h5=fZFiZoLqdvzP28dTpQ9963=G75aw@mail.gmail.com>

On Wed, Jul 20, 2022 at 4:02 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 14:15:58 +0200, Eugenio P?rez wrote:
> > vDPA devices will be migratable soon. Since they are not migratable
> > before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> > for migration blockers, let it hardcoded in that case.
> >
> > Otherwise, ask qemu about the explicit blocker.
> >
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> > v3: Fix indentation
> > ---
> >  src/qemu/qemu_migration.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > index 6ac4ef150b..45e16242f0 100644
> > --- a/src/qemu/qemu_migration.c
> > +++ b/src/qemu/qemu_migration.c
> > @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >      int pauseReason;
> >      size_t i;
> >      int r;
> > +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> > +                                            QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
> >
> >      /* Ask qemu if it have a migration blocker */
> > -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > +    if (blockedReasonsCap) {
> >          g_auto(GStrv) blockers = NULL;
> >          r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> >          if (r != 0) {
> > @@ -1467,7 +1469,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >          }
> >
> >          if (blockers && blockers[0]) {
> > -            g_autofree char *reasons = g_strjoinv(", ", blockers);
> > +            g_autofree char *reasons = g_strjoinv("; ", blockers);
> >              virReportError(VIR_ERR_OPERATION_INVALID,
> >                             _("cannot migrate domain: %s"), reasons);
> >              return false;
>
> This hunk should be squashed into the previous patch.
>

Sorry, I squashed in the wrong patch, I'll send v4 with this.

Thanks!

> > @@ -1580,7 +1582,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >              virDomainNetDef *net = vm->def->nets[i];
> >              qemuSlirp *slirp;
> >
> > -            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
> > +            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
> >                  virReportError(VIR_ERR_OPERATION_INVALID, "%s",
> >                                 _("vDPA devices cannot be migrated"));
> >                  return false;
>
> With that change
>
> Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
>


From eperezma at redhat.com  Wed Jul 20 14:29:45 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 16:29:45 +0200
Subject: [libvirt PATCH v3 3/4] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <YtgKx/xJZQO8rznx@orkuz.int.mamuti.net>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-4-eperezma@redhat.com>
 <YtgKx/xJZQO8rznx@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWfAVgqdpQO5GtcFD3xfP84F8Kgyx8gqtwx77pN5sJuuJQ@mail.gmail.com>

On Wed, Jul 20, 2022 at 4:01 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 14:15:57 +0200, Eugenio P?rez wrote:
> > since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> > will return an array of error strings describing the migration blockers.
> > This can be used to check whether there are any devices blocking
> > migration, etc.
> >
> > Enable qemuMigrationSrcIsAllowed to query it.
> >
> > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > ---
> > v3:
> > * Report message with a colon.
> > * Report all blockers instead of only the first.
> > ---
> >  src/qemu/qemu_migration.c | 34 ++++++++++++++++++++++++++++++++++
> >  1 file changed, 34 insertions(+)
> >
> > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > index b12cb518ee..6ac4ef150b 100644
> > --- a/src/qemu/qemu_migration.c
> > +++ b/src/qemu/qemu_migration.c
> > @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
> >      return true;
> >  }
> >
> > +static int
> > +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> > +                               virDomainObj *vm,
> > +                               char ***blockers)
> > +{
> > +    qemuDomainObjPrivate *priv = vm->privateData;
> > +    int rc;
> > +
> > +    qemuDomainObjEnterMonitor(driver, vm);
> > +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> > +    qemuDomainObjExitMonitor(vm);
> > +
> > +    return rc;
> > +}
> >
> >  /**
> >   * qemuMigrationSrcIsAllowed:
> > @@ -1439,6 +1453,26 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> >      int nsnapshots;
> >      int pauseReason;
> >      size_t i;
> > +    int r;
> > +
> > +    /* Ask qemu if it have a migration blocker */
> > +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > +        g_auto(GStrv) blockers = NULL;
> > +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> > +        if (r != 0) {
> > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > +                           _("cannot migrate domain: %s"),
> > +                           _("error getting blockers"));
> > +            return false;
> > +        }
>
> As mentioned in v2 review the virReportError call should be dropped as
> it overwrites the error reported by qemuDomainGetMigrationBlockers. That
> is, you can just
>
>     if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
>         return false;
>

But there are a few conditions that don't report an error, like a bad
JSON answer. For example, if "blockers" is not an array parsing the
response JSON, libvirt would not print any error, isn't it?

> > +
> > +        if (blockers && blockers[0]) {
> > +            g_autofree char *reasons = g_strjoinv(", ", blockers);
>
> In the following patch you change ", " to "; ". I don't mind that much
> either way, but it should be done in this patch :-)
>
> > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > +                           _("cannot migrate domain: %s"), reasons);
> > +            return false;
> > +        }
> > +    }
> >
> >      /* perform these checks only when migrating to remote hosts */
> >      if (remote) {
>
> Hmm, easy but not trivial changes so I guess v4 would be better.
>
> Jirka
>


From mprivozn at redhat.com  Wed Jul 20 14:28:30 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 16:28:30 +0200
Subject: [PATCH 9/9] domain_conf: rewrite variable setting to ternary
 operator
In-Reply-To: <YtgF6MF272bkkLk/@angien.pipo.sk>
References: <cover.1658322264.git.khanicov@redhat.com>
 <b681ba62caf04365a4b0f48a19de0876db5bc8ea.1658322264.git.khanicov@redhat.com>
 <YtgF6MF272bkkLk/@angien.pipo.sk>
Message-ID: <74413688-4dfb-859c-5500-9ea6934f96a1@redhat.com>

On 7/20/22 15:40, Peter Krempa wrote:
> On Wed, Jul 20, 2022 at 15:11:12 +0200, Kristina Hanicova wrote:
>> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
>> ---
>>  src/conf/domain_conf.c | 8 ++------
>>  1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
>> index e52f39c809..b600bfec31 100644
>> --- a/src/conf/domain_conf.c
>> +++ b/src/conf/domain_conf.c
>> @@ -4206,12 +4206,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
>>      if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
>>          return NULL;
>>  
>> -    if (live) {
>> -        if (flags & VIR_DOMAIN_AFFECT_LIVE)
>> -            *live = true;
>> -        else
>> -            *live = false;
>> -    }
>> +    if (live)
>> +        *live = (flags & VIR_DOMAIN_AFFECT_LIVE) ? true : false;
>>  
> 
> https://libvirt.org/coding-style.html#conditional-expressions
> 
> We suggest that new code avoids ternary operators.
> 
> I'd prefer if this patch is dropped.
> 

And what about:

if (live)
  *live = !!(flags & VIR_DOMAIN_AFFECT_LIVE);

? I agree that current version of the code is more verbose than it needs
to be. And while ternary operators might look bad, in fact I've
suggested them here:


https://gitlab.com/MichalPrivoznik/libvirt/-/commit/d2894d9f07ff2dde77bea53bb39dc8d0176eac85#f6109f17d3eb7394abb620a27ec56d76dd5220b0_4892_4878

Is there any better way?

Michal


From mprivozn at redhat.com  Wed Jul 20 14:39:57 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 16:39:57 +0200
Subject: [PATCH 5/9] domain_conf: replace switch with if in
 virDomainChrDefFree()
In-Reply-To: <YtgGs+rR0dPfNj6U@angien.pipo.sk>
References: <cover.1658322264.git.khanicov@redhat.com>
 <3b8128204eb71cad87e82361f57d34ac9fe5f5c3.1658322264.git.khanicov@redhat.com>
 <YtgGs+rR0dPfNj6U@angien.pipo.sk>
Message-ID: <a2214a05-5e91-3a26-667b-fccca4a6e9cf@redhat.com>

On 7/20/22 15:44, Peter Krempa wrote:
> On Wed, Jul 20, 2022 at 15:11:08 +0200, Kristina Hanicova wrote:
>> Switch is used for just one case, so I replaced it with a simple
>> if condition.
>>
>> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
>> ---
>>  src/conf/domain_conf.c | 7 +------
>>  1 file changed, 1 insertion(+), 6 deletions(-)
>>
>> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
>> index b903dac1cb..f51476c968 100644
>> --- a/src/conf/domain_conf.c
>> +++ b/src/conf/domain_conf.c
>> @@ -2904,8 +2904,7 @@ void virDomainChrDefFree(virDomainChrDef *def)
>>      if (!def)
>>          return;
>>  
>> -    switch (def->deviceType) {
> 
> Alternatively a more future proof (but more verbose) approach which we
> are doing in many places is to use the proper type (either by fixing the
> struct to use proper type, or typecasting) in the switch expression and 
> then simply enumerate all values.
> 
> That way any further addition doesn't have to un-do this patch.

When I tried to do that it wasn't met with much appreciation:

https://listman.redhat.com/archives/libvir-list/2022-May/231776.html

Michal


From jdenemar at redhat.com  Wed Jul 20 14:48:47 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 20 Jul 2022 16:48:47 +0200
Subject: [libvirt PATCH v3 3/4] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <CAJaqyWfAVgqdpQO5GtcFD3xfP84F8Kgyx8gqtwx77pN5sJuuJQ@mail.gmail.com>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-4-eperezma@redhat.com>
 <YtgKx/xJZQO8rznx@orkuz.int.mamuti.net>
 <CAJaqyWfAVgqdpQO5GtcFD3xfP84F8Kgyx8gqtwx77pN5sJuuJQ@mail.gmail.com>
Message-ID: <YtgVzzztfMoAtI6C@orkuz.int.mamuti.net>

On Wed, Jul 20, 2022 at 16:29:45 +0200, Eugenio Perez Martin wrote:
> On Wed, Jul 20, 2022 at 4:01 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> >
> > On Wed, Jul 20, 2022 at 14:15:57 +0200, Eugenio P?rez wrote:
> > > since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> > > will return an array of error strings describing the migration blockers.
> > > This can be used to check whether there are any devices blocking
> > > migration, etc.
> > >
> > > Enable qemuMigrationSrcIsAllowed to query it.
> > >
> > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > ---
> > > v3:
> > > * Report message with a colon.
> > > * Report all blockers instead of only the first.
> > > ---
> > >  src/qemu/qemu_migration.c | 34 ++++++++++++++++++++++++++++++++++
> > >  1 file changed, 34 insertions(+)
> > >
> > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > index b12cb518ee..6ac4ef150b 100644
> > > --- a/src/qemu/qemu_migration.c
> > > +++ b/src/qemu/qemu_migration.c
> > > @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
> > >      return true;
> > >  }
> > >
> > > +static int
> > > +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> > > +                               virDomainObj *vm,
> > > +                               char ***blockers)
> > > +{
> > > +    qemuDomainObjPrivate *priv = vm->privateData;
> > > +    int rc;
> > > +
> > > +    qemuDomainObjEnterMonitor(driver, vm);
> > > +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> > > +    qemuDomainObjExitMonitor(vm);
> > > +
> > > +    return rc;
> > > +}
> > >
> > >  /**
> > >   * qemuMigrationSrcIsAllowed:
> > > @@ -1439,6 +1453,26 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> > >      int nsnapshots;
> > >      int pauseReason;
> > >      size_t i;
> > > +    int r;
> > > +
> > > +    /* Ask qemu if it have a migration blocker */
> > > +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > > +        g_auto(GStrv) blockers = NULL;
> > > +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> > > +        if (r != 0) {
> > > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > > +                           _("cannot migrate domain: %s"),
> > > +                           _("error getting blockers"));
> > > +            return false;
> > > +        }
> >
> > As mentioned in v2 review the virReportError call should be dropped as
> > it overwrites the error reported by qemuDomainGetMigrationBlockers. That
> > is, you can just
> >
> >     if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
> >         return false;
> >
> 
> But there are a few conditions that don't report an error, like a bad
> JSON answer. For example, if "blockers" is not an array parsing the
> response JSON, libvirt would not print any error, isn't it?

Well in qemuDomainGetMigrationBlockers you now have

    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
        return 0;

so you would not get pass r != 0 in such case anyway. If you wanted to
distinguish missing blocked-reasons (that is no blockers) and
blocked-reasons which is not an array (invalid response), you would need
to do something else:

    if (!(jblockers = virJSONValueObjectGet(data, "blocked-reasons")))
        return 0;

    if (!virJSONValueIsArray(jblockers)) {
        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                       _("blocker-reasons is not an array"));
        return -1;
    }

All this inside qemuDomainGetMigrationBlockers() to make sure the
function reports an error when returning -1. The caller would not report
any error anyway.

Jirka

From mprivozn at redhat.com  Wed Jul 20 15:06:43 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 17:06:43 +0200
Subject: Persistent Failed to attach device following transient Failed to
 read product/vendor ID
In-Reply-To: <BN0PR08MB695119D1DCEC73989C8F959483879@BN0PR08MB6951.namprd08.prod.outlook.com>
References: <BN0PR08MB695119D1DCEC73989C8F959483879@BN0PR08MB6951.namprd08.prod.outlook.com>
Message-ID: <fa11e48e-49eb-c339-0c75-26b908473f9c@redhat.com>

On 7/11/22 20:14, Pighin, Anthony (Nokia - CA/Ottawa) wrote:
> I'm attempting to solve the issue reported here:
> 
> https://gitlab.com/libvirt/libvirt/-/issues/345
> 
> Hoping the originator of virHostdevDeleteMissingPCIDevices() will be able to comment, as I am still trying to reproduce the issue with additional debug in place.
> 
> diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
> index c0ce867596..d43354963e 100644
> --- a/src/hypervisor/virhostdev.c
> +++ b/src/hypervisor/virhostdev.c
> @@ -1101,11 +1101,11 @@ virHostdevReAttachPCIDevices(virHostdevManager *mgr,
>          VIR_ERROR(_("Failed to allocate PCI device list: %s"),
>                    virGetLastErrorMessage());
>          virResetLastError();
> -        return;
>      }
> -
> -    virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs,
> -                                     hostdevs, nhostdevs);
> +    else {
> +        virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs,
> +                                        hostdevs, nhostdevs);
> +    }
> 
>      /* Handle the case where PCI devices from the host went missing
>       * during the domain lifetime */
> 

Yeah, this looks like a correct fix, but I'm trying to understand the
original problem more. In the gilab issue you mention 'link bounce' - do
you mean PCIe link?

Michal


From mprivozn at redhat.com  Wed Jul 20 14:57:01 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Wed, 20 Jul 2022 16:57:01 +0200
Subject: [PATCH] qemu: support hotplug cdrom with usb/scsi bus
In-Reply-To: <20220706095710.498385-1-minglei.liu@smartx.com>
References: <20220706095710.498385-1-minglei.liu@smartx.com>
Message-ID: <f7aa532b-7f74-17e6-801e-545939ef97bb@redhat.com>

On 7/6/22 11:57, minglei.liu wrote:
> Qemu support hotplug cdrom device with usb or scsi bus,
> just unblock these devices in qemuDomainAttachDeviceDiskLiveInternal
> and qemuDomainDetachPrepDisk.
> 
> Fixes: #261

We like the full URL as it's easily clickable when viewing git log.

> 
> Signed-off-by: minglei.liu <minglei.liu at smartx.com>
> ---
>  src/qemu/qemu_hotplug.c                       | 13 +++-
>  tests/qemuhotplugtest.c                       | 18 ++++++
>  .../qemuhotplug-cdrom-scsi.xml                |  6 ++
>  .../qemuhotplug-cdrom-usb.xml                 |  6 ++
>  .../qemuhotplug-base-live+cdrom-scsi.xml      | 60 +++++++++++++++++++
>  .../qemuhotplug-base-live+cdrom-usb.xml       | 60 +++++++++++++++++++
>  6 files changed, 160 insertions(+), 3 deletions(-)
>  create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-cdrom-scsi.xml
>  create mode 100644 tests/qemuhotplugtestdevices/qemuhotplug-cdrom-usb.xml
>  create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
>  create mode 100644 tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml
> 
> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
> index 27e68370cf..d917086023 100644
> --- a/src/qemu/qemu_hotplug.c
> +++ b/src/qemu/qemu_hotplug.c
> @@ -992,10 +992,9 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
>      bool releaseSeclabel = false;
>      int ret = -1;
>  
> -    if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ||
> -        disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
> +    if (disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) {
>          virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
> -                       _("cdrom/floppy device hotplug isn't supported"));
> +                       _("floppy device hotplug isn't supported"));
>          return -1;
>      }
>  
> @@ -1025,6 +1024,10 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
>          break;
>  
>      case VIR_DOMAIN_DISK_BUS_VIRTIO:
> +        if (disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) {
> +            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
> +                       _("cdrom device with virtio bus isn't supported"));

Alignment.

> +        }
>          if (qemuDomainEnsureVirtioAddress(&releaseVirtio, vm, dev) < 0)
>              goto cleanup;
>          break;
> @@ -5414,6 +5417,10 @@ qemuDomainDetachPrepDisk(virDomainObj *vm,
>  
>      case VIR_DOMAIN_DISK_DEVICE_CDROM:
>      case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
> +        if ((virDomainDiskBus) disk->bus == VIR_DOMAIN_DISK_BUS_USB ||
> +            (virDomainDiskBus) disk->bus == VIR_DOMAIN_DISK_BUS_SCSI) {

No need for typecasting here. However, this allows floppy hotunplug
which I believe is not supported on QEMU side.

> +            break;
> +        }
>          virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
>                         _("disk device type '%s' cannot be detached"),
>                         virDomainDiskDeviceTypeToString(disk->device));


I'm fixing all these minor issues before pushing.

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Congratulations on your first libvirt contribution!

Michal


From anthony.pighin at nokia.com  Wed Jul 20 15:11:51 2022
From: anthony.pighin at nokia.com (Pighin, Anthony (Nokia - CA/Ottawa))
Date: Wed, 20 Jul 2022 15:11:51 +0000
Subject: Persistent Failed to attach device following transient Failed to
 read product/vendor ID
In-Reply-To: <fa11e48e-49eb-c339-0c75-26b908473f9c@redhat.com>
References: <BN0PR08MB695119D1DCEC73989C8F959483879@BN0PR08MB6951.namprd08.prod.outlook.com>
 <fa11e48e-49eb-c339-0c75-26b908473f9c@redhat.com>
Message-ID: <BN0PR08MB6951D1A586C2E041A0C654E6838E9@BN0PR08MB6951.namprd08.prod.outlook.com>

Correct, PCIe link bounce/flap. The attached PCIe device entered a failed state where it was repeatedly resetting, and therefore the link itself was going up and down.

-----Original Message-----
From: Michal Pr?vozn?k <mprivozn at redhat.com> 
Sent: Wednesday, July 20, 2022 11:07 AM
To: Pighin, Anthony (Nokia - CA/Ottawa) <anthony.pighin at nokia.com>; libvir-list at redhat.com
Subject: Re: Persistent Failed to attach device following transient Failed to read product/vendor ID

On 7/11/22 20:14, Pighin, Anthony (Nokia - CA/Ottawa) wrote:
> I'm attempting to solve the issue reported here:
> 
> https://gitlab.com/libvirt/libvirt/-/issues/345
> 
> Hoping the originator of virHostdevDeleteMissingPCIDevices() will be able to comment, as I am still trying to reproduce the issue with additional debug in place.
> 
> diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c 
> index c0ce867596..d43354963e 100644
> --- a/src/hypervisor/virhostdev.c
> +++ b/src/hypervisor/virhostdev.c
> @@ -1101,11 +1101,11 @@ virHostdevReAttachPCIDevices(virHostdevManager *mgr,
>          VIR_ERROR(_("Failed to allocate PCI device list: %s"),
>                    virGetLastErrorMessage());
>          virResetLastError();
> -        return;
>      }
> -
> -    virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs,
> -                                     hostdevs, nhostdevs);
> +    else {
> +        virHostdevReAttachPCIDevicesImpl(mgr, drv_name, dom_name, pcidevs,
> +                                        hostdevs, nhostdevs);
> +    }
> 
>      /* Handle the case where PCI devices from the host went missing
>       * during the domain lifetime */
> 

Yeah, this looks like a correct fix, but I'm trying to understand the original problem more. In the gilab issue you mention 'link bounce' - do you mean PCIe link?

Michal


From eperezma at redhat.com  Wed Jul 20 16:05:47 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 18:05:47 +0200
Subject: [libvirt PATCH v4 2/4] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <20220720160549.3168021-1-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
Message-ID: <20220720160549.3168021-3-eperezma@redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Enable qemu monitor to send this query.  This will allow
qemuMigrationSrcIsAllowed to dynamically ask for migration blockers,
reducing duplication.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
---
v4:
* Separate return type into its own line

v3:
* Squash some patches
* Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
  blockers.
* Move note to function doc.
---
 src/qemu/qemu_monitor.c      | 11 +++++++++
 src/qemu/qemu_monitor.h      |  4 ++++
 src/qemu/qemu_monitor_json.c | 44 ++++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |  3 +++
 4 files changed, 62 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 109107eaae..e0939beecd 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4486,3 +4486,14 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
 
     return qemuMonitorJSONMigrateRecover(mon, uri);
 }
+
+int
+qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
+                                char ***blockers)
+{
+    VIR_DEBUG("blockers=%p", blockers);
+
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONGetMigrationBlockers(mon, blockers);
+}
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index cc1a0bc8c9..b82f198285 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1543,3 +1543,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
 int
 qemuMonitorMigrateRecover(qemuMonitor *mon,
                           const char *uri);
+
+int
+qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
+                                char ***blockers);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 5e4a86e5ad..6b26dfcb54 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -3338,6 +3338,50 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
     return 0;
 }
 
+/*
+ * Get the exposed migration blockers.
+ *
+ * This function assume qemu has the capability of request them.
+ *
+ * It returns a NULL terminated array on blockers if there are any, or it set
+ * it to NULL otherwise.
+ */
+int
+qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
+                                    char ***blockers)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    virJSONValue *data;
+    virJSONValue *jblockers;
+    size_t i;
+
+    *blockers = NULL;
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
+        return -1;
+
+    data = virJSONValueObjectGetObject(reply, "return");
+
+    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
+        return 0;
+
+    *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1);
+    for (i = 0; i < virJSONValueArraySize(jblockers); i++) {
+        virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i);
+        const char *blocker = virJSONValueGetString(jblocker);
+
+        (*blockers)[i] = g_strdup(blocker);
+    }
+
+    return 0;
+}
+
 int qemuMonitorJSONMigrateCancel(qemuMonitor *mon)
 {
     g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL);
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 2759566892..e4c65e250e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -184,6 +184,9 @@ qemuMonitorJSONMigrate(qemuMonitor *mon,
                        unsigned int flags,
                        const char *uri);
 int
+qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
+                                    char ***blockers);
+int
 qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon,
                                        bool *spice_migrated);
 
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 15:54:34 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Wed, 20 Jul 2022 17:54:34 +0200
Subject: [libvirt PATCH v3 3/4] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <YtgVzzztfMoAtI6C@orkuz.int.mamuti.net>
References: <20220720121558.3150209-1-eperezma@redhat.com>
 <20220720121558.3150209-4-eperezma@redhat.com>
 <YtgKx/xJZQO8rznx@orkuz.int.mamuti.net>
 <CAJaqyWfAVgqdpQO5GtcFD3xfP84F8Kgyx8gqtwx77pN5sJuuJQ@mail.gmail.com>
 <YtgVzzztfMoAtI6C@orkuz.int.mamuti.net>
Message-ID: <CAJaqyWcS8WxrjU5GiHELm_6_aaggTj8bGE-+Fkb7AL=eJLXqoQ@mail.gmail.com>

On Wed, Jul 20, 2022 at 4:48 PM Jiri Denemark <jdenemar at redhat.com> wrote:
>
> On Wed, Jul 20, 2022 at 16:29:45 +0200, Eugenio Perez Martin wrote:
> > On Wed, Jul 20, 2022 at 4:01 PM Jiri Denemark <jdenemar at redhat.com> wrote:
> > >
> > > On Wed, Jul 20, 2022 at 14:15:57 +0200, Eugenio P?rez wrote:
> > > > since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> > > > will return an array of error strings describing the migration blockers.
> > > > This can be used to check whether there are any devices blocking
> > > > migration, etc.
> > > >
> > > > Enable qemuMigrationSrcIsAllowed to query it.
> > > >
> > > > Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> > > > ---
> > > > v3:
> > > > * Report message with a colon.
> > > > * Report all blockers instead of only the first.
> > > > ---
> > > >  src/qemu/qemu_migration.c | 34 ++++++++++++++++++++++++++++++++++
> > > >  1 file changed, 34 insertions(+)
> > > >
> > > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > > index b12cb518ee..6ac4ef150b 100644
> > > > --- a/src/qemu/qemu_migration.c
> > > > +++ b/src/qemu/qemu_migration.c
> > > > @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
> > > >      return true;
> > > >  }
> > > >
> > > > +static int
> > > > +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> > > > +                               virDomainObj *vm,
> > > > +                               char ***blockers)
> > > > +{
> > > > +    qemuDomainObjPrivate *priv = vm->privateData;
> > > > +    int rc;
> > > > +
> > > > +    qemuDomainObjEnterMonitor(driver, vm);
> > > > +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> > > > +    qemuDomainObjExitMonitor(vm);
> > > > +
> > > > +    return rc;
> > > > +}
> > > >
> > > >  /**
> > > >   * qemuMigrationSrcIsAllowed:
> > > > @@ -1439,6 +1453,26 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
> > > >      int nsnapshots;
> > > >      int pauseReason;
> > > >      size_t i;
> > > > +    int r;
> > > > +
> > > > +    /* Ask qemu if it have a migration blocker */
> > > > +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> > > > +        g_auto(GStrv) blockers = NULL;
> > > > +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> > > > +        if (r != 0) {
> > > > +            virReportError(VIR_ERR_OPERATION_INVALID,
> > > > +                           _("cannot migrate domain: %s"),
> > > > +                           _("error getting blockers"));
> > > > +            return false;
> > > > +        }
> > >
> > > As mentioned in v2 review the virReportError call should be dropped as
> > > it overwrites the error reported by qemuDomainGetMigrationBlockers. That
> > > is, you can just
> > >
> > >     if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
> > >         return false;
> > >
> >
> > But there are a few conditions that don't report an error, like a bad
> > JSON answer. For example, if "blockers" is not an array parsing the
> > response JSON, libvirt would not print any error, isn't it?
>
> Well in qemuDomainGetMigrationBlockers you now have
>
>     if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
>         return 0;
>
> so you would not get pass r != 0 in such case anyway. If you wanted to
> distinguish missing blocked-reasons (that is no blockers) and
> blocked-reasons which is not an array (invalid response), you would need
> to do something else:
>
>     if (!(jblockers = virJSONValueObjectGet(data, "blocked-reasons")))
>         return 0;
>
>     if (!virJSONValueIsArray(jblockers)) {
>         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>                        _("blocker-reasons is not an array"));
>         return -1;
>     }
>
> All this inside qemuDomainGetMigrationBlockers() to make sure the
> function reports an error when returning -1. The caller would not report
> any error anyway.
>

That's right.

Deleting error report then.

Thanks!


From eperezma at redhat.com  Wed Jul 20 16:05:49 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 18:05:49 +0200
Subject: [libvirt PATCH v4 4/4] qemu_migration: Do not forbid vDPA devices if
 can query blockers
In-Reply-To: <20220720160549.3168021-1-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
Message-ID: <20220720160549.3168021-5-eperezma@redhat.com>

vDPA devices will be migratable soon. Since they are not migratable
before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
for migration blockers, let it hardcoded in that case.

Otherwise, ask qemu about the explicit blocker.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
---
v3: Fix indentation
---
 src/qemu/qemu_migration.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 2e3044289a..b554027da2 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int pauseReason;
     size_t i;
     int r;
+    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
+                                            QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
 
     /* Ask qemu if it have a migration blocker */
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
+    if (blockedReasonsCap) {
         g_auto(GStrv) blockers = NULL;
         r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
         if (r != 0)
@@ -1576,7 +1578,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
             virDomainNetDef *net = vm->def->nets[i];
             qemuSlirp *slirp;
 
-            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
+            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
                 virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                                _("vDPA devices cannot be migrated"));
                 return false;
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 16:05:45 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 18:05:45 +0200
Subject: [libvirt PATCH v4 0/4] Ask qemu about migration blockers
Message-ID: <20220720160549.3168021-1-eperezma@redhat.com>

There are some hardcoded migration blockers in libvirt, like having a net
vhost-vdpa device. While it's true that they cannot be migrated at the moment,
there are plans to be able to migrate them soon.

They'll put a migration blockers in the cases where you cannot migrate them.
Ask qemu about then before rejecting the migration. In case the question is not
possible, assume they're not migratable.

v4:
* Do not override qemuDomainGetMigrationBlockers error calling again
  virReportError.
* Replace ", " with "; " in blockers separators.

v3:
* Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
  blockers.
* Fix indentation
* Report all blockers instead of only the first.
* Squash some patches
* Move note to function doc.
* s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/

v2:
* Ask qemu if it has some pending blockers before try the migration

Eugenio P?rez (3):
  qemu_monitor: add support for get qemu migration blockers
  qemu_migration: get migration blockers before hardcoded checks
  qemu_migration: Do not forbid vDPA devices if can query blockers

Jonathon Jongsma (1):
  qemu: introduce capability QEMU_CAPS_MIGRATION_BLOCKED_REASONS

 src/qemu/qemu_capabilities.c                  |  2 +
 src/qemu/qemu_capabilities.h                  |  1 +
 src/qemu/qemu_migration.c                     | 34 +++++++++++++-
 src/qemu/qemu_monitor.c                       | 11 +++++
 src/qemu/qemu_monitor.h                       |  4 ++
 src/qemu/qemu_monitor_json.c                  | 44 +++++++++++++++++++
 src/qemu/qemu_monitor_json.h                  |  3 ++
 .../caps_6.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  1 +
 .../caps_6.0.0.x86_64.xml                     |  1 +
 .../caps_6.1.0.x86_64.xml                     |  1 +
 .../caps_6.2.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  1 +
 .../caps_6.2.0.x86_64.xml                     |  1 +
 .../caps_7.0.0.aarch64.xml                    |  1 +
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
 .../caps_7.0.0.x86_64.xml                     |  1 +
 .../caps_7.1.0.x86_64.xml                     |  1 +
 18 files changed, 109 insertions(+), 1 deletion(-)

-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 16:05:46 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 18:05:46 +0200
Subject: [libvirt PATCH v4 1/4] qemu: introduce capability
 QEMU_CAPS_MIGRATION_BLOCKED_REASONS
In-Reply-To: <20220720160549.3168021-1-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
Message-ID: <20220720160549.3168021-2-eperezma@redhat.com>

From: Jonathon Jongsma <jjongsma at redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Signed-off-by: Jonathon Jongsma <jjongsma at redhat.com>
Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
---
v3: s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/
---
 src/qemu/qemu_capabilities.c                      | 2 ++
 src/qemu/qemu_capabilities.h                      | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 +
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 +
 13 files changed, 14 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 30b396d32d..b002fb98ed 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -672,6 +672,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
               "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
+              "migration.blocked-reasons", /* QEMU_CAPS_MIGRATION_BLOCKED_REASONS */
     );
 
 
@@ -1622,6 +1623,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+qemu-vdagent", QEMU_CAPS_CHARDEV_QEMU_VDAGENT },
     { "query-display-options/ret-type/+dbus", QEMU_CAPS_DISPLAY_DBUS },
     { "object-add/arg-type/+iothread/thread-pool-max", QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX },
+    { "query-migrate/ret-type/blocked-reasons", QEMU_CAPS_MIGRATION_BLOCKED_REASONS },
 };
 
 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d979a5ba3b..8f3090e2ce 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -651,6 +651,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
     QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object iothread.thread-pool-max */
     QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
+    QEMU_CAPS_MIGRATION_BLOCKED_REASONS, /* query-migrate returns 'blocked-reasons */
 
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 01e30f4e02..4afd7b26ce 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -187,6 +187,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index aa7b5deab5..c9cb85daa0 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -144,6 +144,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>39100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index d9e385ab1d..508804521c 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -229,6 +229,7 @@
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100242</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 05f297dfa2..d4a540fafd 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -234,6 +234,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6001000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 9cb1a32354..71697fac95 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -199,6 +199,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6001050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 5df148d787..3f86e03f18 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -193,6 +193,7 @@
   <flag name='memory-backend-file.prealloc-threads'/>
   <flag name='virtio-iommu-pci'/>
   <flag name='virtio-net.rss'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index dd011f8408..1a1a9643d4 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -236,6 +236,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 39a5cd154d..a3991e9853 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -207,6 +207,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>6002092</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>61700243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 6e872f4f85..67dff32f50 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -211,6 +211,7 @@
   <flag name='virtio-net.rss'/>
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>42900243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index a8f46df1cd..8ce423557e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -241,6 +241,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='display-dbus'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 8464909698..2b2f1aef52 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -242,6 +242,7 @@
   <flag name='display-dbus'/>
   <flag name='iothread.thread-pool-max'/>
   <flag name='usb-host.guest-resets-all'/>
+  <flag name='migration.blocked-reasons'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-- 
2.31.1


From eperezma at redhat.com  Wed Jul 20 16:05:48 2022
From: eperezma at redhat.com (=?UTF-8?q?Eugenio=20P=C3=A9rez?=)
Date: Wed, 20 Jul 2022 18:05:48 +0200
Subject: [libvirt PATCH v4 3/4] qemu_migration: get migration blockers before
 hardcoded checks
In-Reply-To: <20220720160549.3168021-1-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
Message-ID: <20220720160549.3168021-4-eperezma@redhat.com>

since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
will return an array of error strings describing the migration blockers.
This can be used to check whether there are any devices blocking
migration, etc.

Enable qemuMigrationSrcIsAllowed to query it.

Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
---
v4:
* Do not override qemuDomainGetMigrationBlockers error calling again
  virReportError.
* Replace ", " with "; " in blockers separators.

v3:
* Report message with a colon.
* Report all blockers instead of only the first.
---
 src/qemu/qemu_migration.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b12cb518ee..2e3044289a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
     return true;
 }
 
+static int
+qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
+                               virDomainObj *vm,
+                               char ***blockers)
+{
+    qemuDomainObjPrivate *priv = vm->privateData;
+    int rc;
+
+    qemuDomainObjEnterMonitor(driver, vm);
+    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
+    qemuDomainObjExitMonitor(vm);
+
+    return rc;
+}
 
 /**
  * qemuMigrationSrcIsAllowed:
@@ -1439,6 +1453,22 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int nsnapshots;
     int pauseReason;
     size_t i;
+    int r;
+
+    /* Ask qemu if it have a migration blocker */
+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
+        g_auto(GStrv) blockers = NULL;
+        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
+        if (r != 0)
+            return false;
+
+        if (blockers && blockers[0]) {
+            g_autofree char *reasons = g_strjoinv("; ", blockers);
+            virReportError(VIR_ERR_OPERATION_INVALID,
+                           _("cannot migrate domain: %s"), reasons);
+            return false;
+        }
+    }
 
     /* perform these checks only when migrating to remote hosts */
     if (remote) {
-- 
2.31.1


From lin.a.yang at intel.com  Wed Jul 20 23:12:56 2022
From: lin.a.yang at intel.com (Yang, Lin A)
Date: Wed, 20 Jul 2022 23:12:56 +0000
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
Message-ID: <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>

> This version is a bit better than the previous one. But we're at version
> 13 and I am still unable to even start a guest. Please, make sure that this
> basic functionality works in v14, because this is plain waste of precious
> review bandwidth.
> 
> Anyway, as usual, I've uploaded my suggested fixes here:
> 
> https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx/

Sorry to hear it didn't work in your environment. We definitely tested it
several times and it works well for both QEMU 6.2.0 and 7.0.0.

Let me try to reproduce it with the domain xml you shared before.

By my best guess, if you see "qemu-system-x86_64:***: 
invalid object type: memory-backend-epc" error, it means QEMU didn't
get enough permission to launch SGX VM.

Pls add /dev/sgx_vepc, /dev/sgx_enclave and /dev/sgx_provision to the 
"cgroup_device_acl" list in /etc/libvirt/qemu.conf. QEMU requires those access
to assign EPC, but it was denied  by libvirt?s cgroup controllers by default.

cgroup_device_acl = [  
    "/dev/null", "/dev/full", "/dev/zero",  
    ...
    "/dev/sgx_vepc", 
    "/dev/sgx_enclave?, 
    "/dev/sgx_provision? 
] 

Also in /etc/libvirt/qemu.conf, set the runtime user to uid 0,  since QEMU needs to
read and write to those sgx devices, like /dev/sgx_vepc. Unfortunately, it is owned
by root with file mode 600, so QEMU has to launch as root. 

user = "+0"

It would be really helpful if you can use these steps to see whether it resolve 
the issue. I will add a doc somewhere to include all steps are required for use to
use sgx in libvirt.

Thanks,
Lin.


From haibin.huang at intel.com  Thu Jul 21 02:52:21 2022
From: haibin.huang at intel.com (Huang, Haibin)
Date: Thu, 21 Jul 2022 02:52:21 +0000
Subject: [libvirt][PATCH v13 1/6] Define SGX capabilities structs
In-Reply-To: <f7e4690a-639f-7854-bd34-6fe3ab39f7a5@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-2-lin.a.yang@intel.com>
 <f7e4690a-639f-7854-bd34-6fe3ab39f7a5@redhat.com>
Message-ID: <MW4PR11MB5909BA24A589AB13E22FD1A091919@MW4PR11MB5909.namprd11.prod.outlook.com>



> -----Original Message-----
> From: Michal Pr?vozn?k <mprivozn at redhat.com>
> Sent: Wednesday, July 20, 2022 7:27 PM
> To: Yang, Lin A <lin.a.yang at intel.com>; libvir-list at redhat.com; Huang, Haibin
> <haibin.huang at intel.com>; Ding, Jian-feng <jian-feng.ding at intel.com>
> Subject: Re: [libvirt][PATCH v13 1/6] Define SGX capabilities structs
> 
> On 7/1/22 21:14, Lin Yang wrote:
> > From: Haibin Huang <haibin.huang at intel.com>
> >
> > Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> > Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> > ---
> >  src/conf/domain_capabilities.c | 10 ++++++++++
> > src/conf/domain_capabilities.h | 24 ++++++++++++++++++++++++
> >  src/libvirt_private.syms       |  1 +
> >  3 files changed, 35 insertions(+)
> >
> > diff --git a/src/conf/domain_capabilities.c
> > b/src/conf/domain_capabilities.c index 895e8d00e8..27f3fb8d36 100644
> > --- a/src/conf/domain_capabilities.c
> > +++ b/src/conf/domain_capabilities.c
> > @@ -76,6 +76,16 @@ virSEVCapabilitiesFree(virSEVCapability *cap)  }
> >
> >
> > +void
> > +virSGXCapabilitiesFree(virSGXCapability *cap) {
> > +    if (!cap)
> > +        return;
> > +
> 
> This leaks cap->pSections.
[Haibin] OK
> 
> > +    g_free(cap);
> > +}
> > +
> > +
> >  static void
> >  virDomainCapsDispose(void *obj)
> >  {
> > diff --git a/src/conf/domain_capabilities.h
> > b/src/conf/domain_capabilities.h index f2eed80b15..dac1098e98 100644
> > --- a/src/conf/domain_capabilities.h
> > +++ b/src/conf/domain_capabilities.h
> > @@ -192,6 +192,24 @@ struct _virSEVCapability {
> >      unsigned int max_es_guests;
> >  };
> >
> > +typedef struct _virSection virSection; typedef virSection
> > +*virSectionPtr;
> 
> No, if we can help it I'd rather avoid introducing virXXXPtr typedef.
> We've worked hard to get rid of them and I don't quite see a reason to
> reintroduce them.
> 
> > +struct _virSection {
> > +    unsigned long long size;
> > +    unsigned int node;
> 
> While it's true that QEMU with its current code does not ever report a
> negative number for 'node', at the QAPI level it's declared as signed integer
> and thus we ought to reflect that.
> 
[Haibin] OK
> > +};
> > +
> > +typedef struct _virSGXCapability virSGXCapability; typedef
> > +virSGXCapability *virSGXCapabilityPtr; struct _virSGXCapability {
> > +    bool flc;
> > +    bool sgx1;
> > +    bool sgx2;
> > +    unsigned long long section_size;
> > +    size_t nSections;
> > +    virSectionPtr pSections;
> 
> We tend to use: 'nitems' and 'items', or 'nsections' and 'sections' in cases like
> this.
[Haibin] OK
> 
> > +};
> > +
> 
> Michal


From laine at redhat.com  Thu Jul 21 05:02:01 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 01:02:01 -0400
Subject: [libvirt PATCH v4 0/4] Ask qemu about migration blockers
In-Reply-To: <20220720160549.3168021-1-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
Message-ID: <e4703f4f-105a-b91e-e204-ae6a6242cf78@redhat.com>

This all looks good except a couple small nits that I've noted in 
separate messages for the individual patches.

I've already made these minor changes locally and pushed them here:

   https://gitlab.com/lainestump/libvirt/-/commits/REVIEW

If it all looks okay to you, I'll push it as soon as I get up in the AM. 
If you don't like the changes I've made to the commit log messages, feel 
free to revise and re-send them :-)

This is a pretty good turn around time for your first patch in libvirt. 
Thanks for the contribution!

On 7/20/22 12:05 PM, Eugenio P?rez wrote:
> There are some hardcoded migration blockers in libvirt, like having a net
> vhost-vdpa device. While it's true that they cannot be migrated at the moment,
> there are plans to be able to migrate them soon
> 
> They'll put a migration blockers in the cases where you cannot migrate them.
> Ask qemu about then before rejecting the migration. In case the question is not
> possible, assume they're not migratable.
> 
> v4:
> * Do not override qemuDomainGetMigrationBlockers error calling again
>    virReportError.
> * Replace ", " with "; " in blockers separators.
> 
> v3:
> * Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
>    blockers.
> * Fix indentation
> * Report all blockers instead of only the first.
> * Squash some patches
> * Move note to function doc.
> * s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/
> 
> v2:
> * Ask qemu if it has some pending blockers before try the migration
> 
> Eugenio P?rez (3):
>    qemu_monitor: add support for get qemu migration blockers
>    qemu_migration: get migration blockers before hardcoded checks
>    qemu_migration: Do not forbid vDPA devices if can query blockers
> 
> Jonathon Jongsma (1):
>    qemu: introduce capability QEMU_CAPS_MIGRATION_BLOCKED_REASONS
> 
>   src/qemu/qemu_capabilities.c                  |  2 +
>   src/qemu/qemu_capabilities.h                  |  1 +
>   src/qemu/qemu_migration.c                     | 34 +++++++++++++-
>   src/qemu/qemu_monitor.c                       | 11 +++++
>   src/qemu/qemu_monitor.h                       |  4 ++
>   src/qemu/qemu_monitor_json.c                  | 44 +++++++++++++++++++
>   src/qemu/qemu_monitor_json.h                  |  3 ++
>   .../caps_6.0.0.aarch64.xml                    |  1 +
>   .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  1 +
>   .../caps_6.0.0.x86_64.xml                     |  1 +
>   .../caps_6.1.0.x86_64.xml                     |  1 +
>   .../caps_6.2.0.aarch64.xml                    |  1 +
>   .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  1 +
>   .../caps_6.2.0.x86_64.xml                     |  1 +
>   .../caps_7.0.0.aarch64.xml                    |  1 +
>   .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
>   .../caps_7.0.0.x86_64.xml                     |  1 +
>   .../caps_7.1.0.x86_64.xml                     |  1 +
>   18 files changed, 109 insertions(+), 1 deletion(-)
> 


From laine at redhat.com  Thu Jul 21 05:07:24 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 01:07:24 -0400
Subject: [libvirt PATCH v4 3/4] qemu_migration: get migration blockers
 before hardcoded checks
In-Reply-To: <20220720160549.3168021-4-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
 <20220720160549.3168021-4-eperezma@redhat.com>
Message-ID: <9405e115-81b1-f71f-47c3-37f3f19f0028@redhat.com>

On 7/20/22 12:05 PM, Eugenio P?rez wrote:
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Enable qemuMigrationSrcIsAllowed to query it.

I reworded the commit log message a bit. Rather than repeating it here, 
I'll just point you to the branch I pushed to gitlab (link in my 
response to the cover letter).
> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
> ---
> v4:
> * Do not override qemuDomainGetMigrationBlockers error calling again
>    virReportError.
> * Replace ", " with "; " in blockers separators.
> 
> v3:
> * Report message with a colon.
> * Report all blockers instead of only the first.
> ---
>   src/qemu/qemu_migration.c | 30 ++++++++++++++++++++++++++++++
>   1 file changed, 30 insertions(+)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index b12cb518ee..2e3044289a 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1414,6 +1414,20 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
>       return true;
>   }
>   
> +static int
> +qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
> +                               virDomainObj *vm,
> +                               char ***blockers)
> +{
> +    qemuDomainObjPrivate *priv = vm->privateData;
> +    int rc;
> +
> +    qemuDomainObjEnterMonitor(driver, vm);
> +    rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
> +    qemuDomainObjExitMonitor(vm);
> +
> +    return rc;
> +}
>   

Note that we've been trying to keep 2 blank lines between each function, 
but here you've added a new function in between those 2 blank lines, so 
there's only a single blank before and after. I added in the extra blanks.

>   /**
>    * qemuMigrationSrcIsAllowed:
> @@ -1439,6 +1453,22 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>       int nsnapshots;
>       int pauseReason;
>       size_t i;
> +    int r;
> +
> +    /* Ask qemu if it have a migration blocker */

    "has a migration blocker"

> +    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> +        g_auto(GStrv) blockers = NULL;
> +        r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
> +        if (r != 0)
> +            return false;

in libvirt we usually return -1 on failure, and check with "if (r < 0)". 
And since that is the only use of "r", we prefer to not have the extra 
stack variable cluttering things up, so:

      if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
          return false;

> +
> +        if (blockers && blockers[0]) {
> +            g_autofree char *reasons = g_strjoinv("; ", blockers);
> +            virReportError(VIR_ERR_OPERATION_INVALID,
> +                           _("cannot migrate domain: %s"), reasons);
> +            return false;
> +        }
> +    }
>   
>       /* perform these checks only when migrating to remote hosts */
>       if (remote) {


From laine at redhat.com  Thu Jul 21 05:09:51 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 01:09:51 -0400
Subject: [libvirt PATCH v4 2/4] qemu_monitor: add support for get qemu
 migration blockers
In-Reply-To: <20220720160549.3168021-3-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
 <20220720160549.3168021-3-eperezma@redhat.com>
Message-ID: <af2910bd-1a66-fd50-51f7-1121fb733c7f@redhat.com>

On 7/20/22 12:05 PM, Eugenio P?rez wrote:
> since qemu 6.0, if migration is blocked for some reason, 'query-migrate'
> will return an array of error strings describing the migration blockers.
> This can be used to check whether there are any devices blocking
> migration, etc.
> 
> Enable qemu monitor to send this query.  This will allow
> qemuMigrationSrcIsAllowed to dynamically ask for migration blockers,
> reducing duplication.

I reworded this commit log a bit - see the branch I linked in my 
response to the cover letter and let me know if you approve.

> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
> ---
> v4:
> * Separate return type into its own line
> 
> v3:
> * Squash some patches
> * Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
>    blockers.
> * Move note to function doc.
> ---
>   src/qemu/qemu_monitor.c      | 11 +++++++++
>   src/qemu/qemu_monitor.h      |  4 ++++
>   src/qemu/qemu_monitor_json.c | 44 ++++++++++++++++++++++++++++++++++++
>   src/qemu/qemu_monitor_json.h |  3 +++
>   4 files changed, 62 insertions(+)
> 
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index 109107eaae..e0939beecd 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -4486,3 +4486,14 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
>   
>       return qemuMonitorJSONMigrateRecover(mon, uri);
>   }
> +
> +int
> +qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
> +                                char ***blockers)

We try to keep 2 blank lines between each function. I added in the extra 
blank lines before and after this function.

> +{
> +    VIR_DEBUG("blockers=%p", blockers);
> +
> +    QEMU_CHECK_MONITOR(mon);
> +
> +    return qemuMonitorJSONGetMigrationBlockers(mon, blockers);
> +}
> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
> index cc1a0bc8c9..b82f198285 100644
> --- a/src/qemu/qemu_monitor.h
> +++ b/src/qemu/qemu_monitor.h
> @@ -1543,3 +1543,7 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor *mon,
>   int
>   qemuMonitorMigrateRecover(qemuMonitor *mon,
>                             const char *uri);
> +
> +int
> +qemuMonitorGetMigrationBlockers(qemuMonitor *mon,
> +                                char ***blockers);
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 5e4a86e5ad..6b26dfcb54 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -3338,6 +3338,50 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon,
>       return 0;
>   }
>   
> +/*
> + * Get the exposed migration blockers.
> + *
> + * This function assume qemu has the capability of request them.
> + *
> + * It returns a NULL terminated array on blockers if there are any, or it set
> + * it to NULL otherwise.
> + */
> +int
> +qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
> +                                    char ***blockers)
> +{
> +    g_autoptr(virJSONValue) cmd = NULL;
> +    g_autoptr(virJSONValue) reply = NULL;
> +    virJSONValue *data;
> +    virJSONValue *jblockers;
> +    size_t i;
> +
> +    *blockers = NULL;
> +    if (!(cmd = qemuMonitorJSONMakeCommand("query-migrate", NULL)))
> +        return -1;
> +
> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> +        return -1;
> +
> +    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_OBJECT) < 0)
> +        return -1;
> +
> +    data = virJSONValueObjectGetObject(reply, "return");
> +
> +    if (!(jblockers = virJSONValueObjectGetArray(data, "blocked-reasons")))
> +        return 0;
> +
> +    *blockers = g_new0(char *, virJSONValueArraySize(jblockers) + 1);
> +    for (i = 0; i < virJSONValueArraySize(jblockers); i++) {
> +        virJSONValue *jblocker = virJSONValueArrayGet(jblockers, i);
> +        const char *blocker = virJSONValueGetString(jblocker);
> +
> +        (*blockers)[i] = g_strdup(blocker);
> +    }
> +
> +    return 0;
> +}
> +
>   int qemuMonitorJSONMigrateCancel(qemuMonitor *mon)
>   {
>       g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("migrate_cancel", NULL);
> diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
> index 2759566892..e4c65e250e 100644
> --- a/src/qemu/qemu_monitor_json.h
> +++ b/src/qemu/qemu_monitor_json.h
> @@ -184,6 +184,9 @@ qemuMonitorJSONMigrate(qemuMonitor *mon,
>                          unsigned int flags,
>                          const char *uri);
>   int
> +qemuMonitorJSONGetMigrationBlockers(qemuMonitor *mon,
> +                                    char ***blockers);
> +int
>   qemuMonitorJSONGetSpiceMigrationStatus(qemuMonitor *mon,
>                                          bool *spice_migrated);
>   


From laine at redhat.com  Thu Jul 21 05:14:13 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 01:14:13 -0400
Subject: [libvirt PATCH v4 4/4] qemu_migration: Do not forbid vDPA devices
 if can query blockers
In-Reply-To: <20220720160549.3168021-5-eperezma@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
 <20220720160549.3168021-5-eperezma@redhat.com>
Message-ID: <74444f17-5932-2574-59fb-4be23f80c5b2@redhat.com>

On 7/20/22 12:05 PM, Eugenio P?rez wrote:
> vDPA devices will be migratable soon. Since they are not migratable
> before qemu 6.0, and qemu pre-6.0 didn't have the capability of asking
> for migration blockers, let it hardcoded in that case.
> 
> Otherwise, ask qemu about the explicit blocker.

I reworded the commit log message, but otherwise this is all fine.

> 
> Signed-off-by: Eugenio P?rez <eperezma at redhat.com>
> Reviewed-by: Jiri Denemark <jdenemar at redhat.com>
> ---
> v3: Fix indentation
> ---
>   src/qemu/qemu_migration.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 2e3044289a..b554027da2 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1454,9 +1454,11 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>       int pauseReason;
>       size_t i;
>       int r;
> +    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
> +                                            QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
>   
>       /* Ask qemu if it have a migration blocker */
> -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_BLOCKED_REASONS)) {
> +    if (blockedReasonsCap) {
>           g_auto(GStrv) blockers = NULL;
>           r = qemuDomainGetMigrationBlockers(driver, vm, &blockers);
>           if (r != 0)
> @@ -1576,7 +1578,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
>               virDomainNetDef *net = vm->def->nets[i];
>               qemuSlirp *slirp;
>   
> -            if (net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
> +            if (!blockedReasonsCap && net->type == VIR_DOMAIN_NET_TYPE_VDPA) {
>                   virReportError(VIR_ERR_OPERATION_INVALID, "%s",
>                                  _("vDPA devices cannot be migrated"));
>                   return false;


From eperezma at redhat.com  Thu Jul 21 05:31:07 2022
From: eperezma at redhat.com (Eugenio Perez Martin)
Date: Thu, 21 Jul 2022 07:31:07 +0200
Subject: [libvirt PATCH v4 0/4] Ask qemu about migration blockers
In-Reply-To: <e4703f4f-105a-b91e-e204-ae6a6242cf78@redhat.com>
References: <20220720160549.3168021-1-eperezma@redhat.com>
 <e4703f4f-105a-b91e-e204-ae6a6242cf78@redhat.com>
Message-ID: <CAJaqyWfk=j2ryYNOKQ4Gv-esfHacRLct=LoS+ZUrZqp-duf-Yg@mail.gmail.com>

On Thu, Jul 21, 2022 at 7:02 AM Laine Stump <laine at redhat.com> wrote:
>
> This all looks good except a couple small nits that I've noted in
> separate messages for the individual patches.
>
> I've already made these minor changes locally and pushed them here:
>
>    https://gitlab.com/lainestump/libvirt/-/commits/REVIEW
>
> If it all looks okay to you, I'll push it as soon as I get up in the AM.
> If you don't like the changes I've made to the commit log messages, feel
> free to revise and re-send them :-)
>

All changes look good to me :). Not an english native, and not used to
libvirt codebase so I missed a few of these coding styles.

Thanks!

> This is a pretty good turn around time for your first patch in libvirt.
> Thanks for the contribution!
>
> On 7/20/22 12:05 PM, Eugenio P?rez wrote:
> > There are some hardcoded migration blockers in libvirt, like having a net
> > vhost-vdpa device. While it's true that they cannot be migrated at the moment,
> > there are plans to be able to migrate them soon
> >
> > They'll put a migration blockers in the cases where you cannot migrate them.
> > Ask qemu about then before rejecting the migration. In case the question is not
> > possible, assume they're not migratable.
> >
> > v4:
> > * Do not override qemuDomainGetMigrationBlockers error calling again
> >    virReportError.
> > * Replace ", " with "; " in blockers separators.
> >
> > v3:
> > * Return ok in qemuMonitorJSONGetMigrationBlockers is there are no
> >    blockers.
> > * Fix indentation
> > * Report all blockers instead of only the first.
> > * Squash some patches
> > * Move note to function doc.
> > * s/QEMU_MIGRATION_BLOCKED_REASONS/QEMU_CAPS_MIGRATION_BLOCKED_REASONS/
> >
> > v2:
> > * Ask qemu if it has some pending blockers before try the migration
> >
> > Eugenio P?rez (3):
> >    qemu_monitor: add support for get qemu migration blockers
> >    qemu_migration: get migration blockers before hardcoded checks
> >    qemu_migration: Do not forbid vDPA devices if can query blockers
> >
> > Jonathon Jongsma (1):
> >    qemu: introduce capability QEMU_CAPS_MIGRATION_BLOCKED_REASONS
> >
> >   src/qemu/qemu_capabilities.c                  |  2 +
> >   src/qemu/qemu_capabilities.h                  |  1 +
> >   src/qemu/qemu_migration.c                     | 34 +++++++++++++-
> >   src/qemu/qemu_monitor.c                       | 11 +++++
> >   src/qemu/qemu_monitor.h                       |  4 ++
> >   src/qemu/qemu_monitor_json.c                  | 44 +++++++++++++++++++
> >   src/qemu/qemu_monitor_json.h                  |  3 ++
> >   .../caps_6.0.0.aarch64.xml                    |  1 +
> >   .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  1 +
> >   .../caps_6.0.0.x86_64.xml                     |  1 +
> >   .../caps_6.1.0.x86_64.xml                     |  1 +
> >   .../caps_6.2.0.aarch64.xml                    |  1 +
> >   .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  1 +
> >   .../caps_6.2.0.x86_64.xml                     |  1 +
> >   .../caps_7.0.0.aarch64.xml                    |  1 +
> >   .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  1 +
> >   .../caps_7.0.0.x86_64.xml                     |  1 +
> >   .../caps_7.1.0.x86_64.xml                     |  1 +
> >   18 files changed, 109 insertions(+), 1 deletion(-)
> >
>


From laine at redhat.com  Thu Jul 21 06:21:12 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 02:21:12 -0400
Subject: [PATCH 1/2] qemu: don't try to query QEMU about migration blockers
 during offline migration
In-Reply-To: <20220721062113.254515-1-laine@redhat.com>
References: <20220721062113.254515-1-laine@redhat.com>
Message-ID: <20220721062113.254515-2-laine@redhat.com>

The new code that queries QEMU about migration blockers was put at the
top of qemuMigrationSrcIsAllowed(), but that function can also be
called in the case of offline migration (ie when the domain is
inactive / QEMU isn't running). This check should have been put inside
the "if (!(flags & VIR_MIGRATE_OFFLINE))" conditional, so let's move
it there.

Fixes: 156e99f686690855be4e45d9b8b3194191a8bc31
Signed-off-by: Laine Stump <laine at redhat.com>
---
 src/qemu/qemu_migration.c | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5d1e5f987b..6fc5791f61 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1455,22 +1455,6 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     int nsnapshots;
     int pauseReason;
     size_t i;
-    bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
-                                            QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
-
-    /* Ask qemu if it have a migration blocker */
-    if (blockedReasonsCap) {
-        g_auto(GStrv) blockers = NULL;
-        if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
-            return false;
-
-        if (blockers && blockers[0]) {
-            g_autofree char *reasons = g_strjoinv("; ", blockers);
-            virReportError(VIR_ERR_OPERATION_INVALID,
-                           _("cannot migrate domain: %s"), reasons);
-            return false;
-        }
-    }
 
     /* perform these checks only when migrating to remote hosts */
     if (remote) {
@@ -1488,6 +1472,24 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
 
     /* following checks don't make sense for offline migration */
     if (!(flags & VIR_MIGRATE_OFFLINE)) {
+        bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
+                                                QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
+
+        /* Ask qemu if it has a migration blocker */
+        if (blockedReasonsCap) {
+            g_auto(GStrv) blockers = NULL;
+
+            if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
+                return false;
+
+            if (blockers && blockers[0]) {
+                g_autofree char *reasons = g_strjoinv("; ", blockers);
+                virReportError(VIR_ERR_OPERATION_INVALID,
+                               _("cannot migrate domain: %s"), reasons);
+                return false;
+            }
+        }
+
         if (remote) {
             /* cancel migration if disk I/O error is emitted while migrating */
             if (flags & VIR_MIGRATE_ABORT_ON_ERROR &&
-- 
2.35.3


From laine at redhat.com  Thu Jul 21 06:21:13 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 02:21:13 -0400
Subject: [PATCH 2/2] qemu: skip hardcoded hostdev migration check if QEMU can
 do it for us
In-Reply-To: <20220721062113.254515-1-laine@redhat.com>
References: <20220721062113.254515-1-laine@redhat.com>
Message-ID: <20220721062113.254515-3-laine@redhat.com>

libvirt currently will block migration for any vfio-assigned device
unless it is a network device that is associated with a virtio-net
failover device (ie. if the hostdev object has a teaming->type ==
VIR_DOMAIN_NET_TEAMING_TYPE_TRANSIENT).

In the future there will be other vfio devices that can be migrated,
so we don't want to rely on this hardcoded block. QEMU 6.0+ will
anyway inform us of any devices that will block migration (as a part
of qemuDomainGetMigrationBlockers()), so we only need to do the
hardcoded check in the case of old QEMU that can't provide that
information.

Signed-off-by: Laine Stump <laine at redhat.com>
---
 src/qemu/qemu_migration.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 6fc5791f61..4ad5b7af39 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1488,6 +1488,14 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
                                _("cannot migrate domain: %s"), reasons);
                 return false;
             }
+        } else {
+            /* checks here are for anything that doesn't need to be
+             * checked by libvirt if running QEMU that can be queried
+             * about migration blockers.
+             */
+
+            if (!qemuMigrationSrcIsAllowedHostdev(vm->def))
+                return false;
         }
 
         if (remote) {
@@ -1514,9 +1522,6 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
             return false;
         }
 
-        if (!qemuMigrationSrcIsAllowedHostdev(vm->def))
-            return false;
-
         if (vm->def->cpu) {
             /* QEMU blocks migration and save with invariant TSC enabled
              * unless TSC frequency is explicitly set.
-- 
2.35.3


From laine at redhat.com  Thu Jul 21 06:21:11 2022
From: laine at redhat.com (Laine Stump)
Date: Thu, 21 Jul 2022 02:21:11 -0400
Subject: [PATCH 0/2] A couple of migration blocker query patches
Message-ID: <20220721062113.254515-1-laine@redhat.com>

Five minutes after pushing eperezma's patches that query QEMU for
migration blockers, I realized that the query would be called during
"offline migration" (when there is no QEMU process running). So the
1st patch moves the query down so it will only be called during live
migration.

The 2nd patch takes advantage of this new query to skip the hardcoded
check the makes any vfio assigned device a migration blocker. Once
QEMU and the kernel get migration of (some) vfio devices sorted out,
libvirt will allow migration of domains with those devices.

Laine Stump (2):
  qemu: don't try to query QEMU about migration blockers during offline
    migration
  qemu: skip hardcoded hostdev migration check if QEMU can do it for us

 src/qemu/qemu_migration.c | 45 ++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 19 deletions(-)

-- 
2.35.3


From berrange at redhat.com  Thu Jul 21 08:06:57 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 21 Jul 2022 09:06:57 +0100
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
Message-ID: <YtkJITO+5QjumAQW@redhat.com>

On Wed, Jul 20, 2022 at 11:12:56PM +0000, Yang, Lin A wrote:
> > This version is a bit better than the previous one. But we're at version
> > 13 and I am still unable to even start a guest. Please, make sure that this
> > basic functionality works in v14, because this is plain waste of precious
> > review bandwidth.
> > 
> > Anyway, as usual, I've uploaded my suggested fixes here:
> > 
> > https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx/
> 
> Sorry to hear it didn't work in your environment. We definitely tested it
> several times and it works well for both QEMU 6.2.0 and 7.0.0.
> 
> Let me try to reproduce it with the domain xml you shared before.
> 
> By my best guess, if you see "qemu-system-x86_64:***: 
> invalid object type: memory-backend-epc" error, it means QEMU didn't
> get enough permission to launch SGX VM.
> 
> Pls add /dev/sgx_vepc, /dev/sgx_enclave and /dev/sgx_provision to the 
> "cgroup_device_acl" list in /etc/libvirt/qemu.conf. QEMU requires those access
> to assign EPC, but it was denied  by libvirt?s cgroup controllers by default.
> 
> cgroup_device_acl = [  
>     "/dev/null", "/dev/full", "/dev/zero",  
>     ...
>     "/dev/sgx_vepc", 
>     "/dev/sgx_enclave?, 
>     "/dev/sgx_provision? 
> ] 
> 
> Also in /etc/libvirt/qemu.conf, set the runtime user to uid 0,  since QEMU needs to
> read and write to those sgx devices, like /dev/sgx_vepc. Unfortunately, it is owned
> by root with file mode 600, so QEMU has to launch as root. 
> 
> user = "+0"
> 
> It would be really helpful if you can use these steps to see whether it resolve 
> the issue. I will add a doc somewhere to include all steps are required for use to
> use sgx in libvirt.

The need to customize qemu.conf to change cgroups ACLs and set uid==0 makes
this patch series unusal in the real world deployments. It cannot be merged
with such problems existing.

Are the /dev/sgx* fundamentally required to be restricted to root access
only, or is it safe to make them accessible to non-root ? ie If a malicious
user has access to those files, what is the impact they have ? Bear in mind
that QEMU itself can be malicious if the guest compromises it.

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mkletzan at redhat.com  Thu Jul 21 08:44:45 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 10:44:45 +0200
Subject: [PATCH 9/9] domain_conf: rewrite variable setting to ternary
 operator
In-Reply-To: <74413688-4dfb-859c-5500-9ea6934f96a1@redhat.com>
References: <cover.1658322264.git.khanicov@redhat.com>
 <b681ba62caf04365a4b0f48a19de0876db5bc8ea.1658322264.git.khanicov@redhat.com>
 <YtgF6MF272bkkLk/@angien.pipo.sk>
 <74413688-4dfb-859c-5500-9ea6934f96a1@redhat.com>
Message-ID: <YtkR/feTullB/TrR@wheatley>

On Wed, Jul 20, 2022 at 04:28:30PM +0200, Michal Pr?vozn?k wrote:
>On 7/20/22 15:40, Peter Krempa wrote:
>> On Wed, Jul 20, 2022 at 15:11:12 +0200, Kristina Hanicova wrote:
>>> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
>>> ---
>>>  src/conf/domain_conf.c | 8 ++------
>>>  1 file changed, 2 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
>>> index e52f39c809..b600bfec31 100644
>>> --- a/src/conf/domain_conf.c
>>> +++ b/src/conf/domain_conf.c
>>> @@ -4206,12 +4206,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
>>>      if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
>>>          return NULL;
>>>
>>> -    if (live) {
>>> -        if (flags & VIR_DOMAIN_AFFECT_LIVE)
>>> -            *live = true;
>>> -        else
>>> -            *live = false;
>>> -    }
>>> +    if (live)
>>> +        *live = (flags & VIR_DOMAIN_AFFECT_LIVE) ? true : false;
>>>
>>
>> https://libvirt.org/coding-style.html#conditional-expressions
>>
>> We suggest that new code avoids ternary operators.
>>
>> I'd prefer if this patch is dropped.
>>
>
>And what about:
>
>if (live)
>  *live = !!(flags & VIR_DOMAIN_AFFECT_LIVE);
>
>? I agree that current version of the code is more verbose than it needs
>to be. And while ternary operators might look bad, in fact I've
>suggested them here:
>
>
>https://gitlab.com/MichalPrivoznik/libvirt/-/commit/d2894d9f07ff2dde77bea53bb39dc8d0176eac85#f6109f17d3eb7394abb620a27ec56d76dd5220b0_4892_4878
>
>Is there any better way?
>

I'll jump in as well, since this seems to be a very heated topic.

How about just:

if (live)
     *live = flags & VIR_DOMAIN_AFFECT_LIVE;

??

If you are worried about the value, then be aware that according to C11
[0] and even C99 [1] (could not find reliable source for C89) section
"6.3.1.2 Boolean type", point 1:

     When any scalar value is converted to _Bool, the result is 0 if the
     value compares equal to 0; otherwise, the result is 1.

[0] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.pdf
[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf

>Michal
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/819333f2/attachment-0001.sig>

From jdenemar at redhat.com  Thu Jul 21 08:51:06 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Thu, 21 Jul 2022 10:51:06 +0200
Subject: [PATCH 0/2] A couple of migration blocker query patches
In-Reply-To: <20220721062113.254515-1-laine@redhat.com>
References: <20220721062113.254515-1-laine@redhat.com>
Message-ID: <YtkTel2DXSthUeDR@orkuz.int.mamuti.net>

On Thu, Jul 21, 2022 at 02:21:11 -0400, Laine Stump wrote:
> Five minutes after pushing eperezma's patches that query QEMU for
> migration blockers, I realized that the query would be called during
> "offline migration" (when there is no QEMU process running). So the
> 1st patch moves the query down so it will only be called during live
> migration.
> 
> The 2nd patch takes advantage of this new query to skip the hardcoded
> check the makes any vfio assigned device a migration blocker. Once
> QEMU and the kernel get migration of (some) vfio devices sorted out,
> libvirt will allow migration of domains with those devices.
> 
> Laine Stump (2):
>   qemu: don't try to query QEMU about migration blockers during offline
>     migration
>   qemu: skip hardcoded hostdev migration check if QEMU can do it for us
> 
>  src/qemu/qemu_migration.c | 45 ++++++++++++++++++++++-----------------
>  1 file changed, 26 insertions(+), 19 deletions(-)

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

From abologna at redhat.com  Thu Jul 21 09:32:26 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Thu, 21 Jul 2022 11:32:26 +0200
Subject: [libvirt PATCH 0/3] qemu: Allow IOMMU devices to have aliases
Message-ID: <20220721093229.91273-1-abologna@redhat.com>



Andrea Bolognani (3):
  schema: Allow IOMMU devices to have aliases
  qemu: Assign default alias to IOMMU devices
  qemu: Add IOMMU device alias to command line

 src/conf/schemas/domaincommon.rng                      |  3 +++
 src/qemu/qemu_alias.c                                  | 10 ++++++++++
 src/qemu/qemu_command.c                                |  2 ++
 .../intel-iommu-aw-bits.x86_64-latest.args             |  2 +-
 .../intel-iommu-caching-mode.x86_64-latest.args        |  2 +-
 .../intel-iommu-device-iotlb.x86_64-latest.args        |  2 +-
 .../intel-iommu-eim.x86_64-latest.args                 |  2 +-
 tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args  |  2 +-
 .../virtio-iommu-aarch64.aarch64-latest.args           |  2 +-
 .../virtio-iommu-x86_64.x86_64-latest.args             |  2 +-
 10 files changed, 22 insertions(+), 7 deletions(-)

-- 
2.35.3


From abologna at redhat.com  Thu Jul 21 09:32:27 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Thu, 21 Jul 2022 11:32:27 +0200
Subject: [libvirt PATCH 1/3] schema: Allow IOMMU devices to have aliases
In-Reply-To: <20220721093229.91273-1-abologna@redhat.com>
References: <20220721093229.91273-1-abologna@redhat.com>
Message-ID: <20220721093229.91273-2-abologna@redhat.com>

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 src/conf/schemas/domaincommon.rng | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 2f07c25430..d15dd33f47 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -5658,6 +5658,9 @@
         <optional>
           <ref name="address"/>
         </optional>
+        <optional>
+          <ref name="alias"/>
+        </optional>
       </interleave>
     </element>
   </define>
-- 
2.35.3


From abologna at redhat.com  Thu Jul 21 09:32:28 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Thu, 21 Jul 2022 11:32:28 +0200
Subject: [libvirt PATCH 2/3] qemu: Assign default alias to IOMMU devices
In-Reply-To: <20220721093229.91273-1-abologna@redhat.com>
References: <20220721093229.91273-1-abologna@redhat.com>
Message-ID: <20220721093229.91273-3-abologna@redhat.com>

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 src/qemu/qemu_alias.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 7efd91051e..7b91fe3141 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -597,6 +597,14 @@ qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock)
 }
 
 
+static void
+qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu)
+{
+    if (!iommu->info.alias)
+        iommu->info.alias = g_strdup("iommu0");
+}
+
+
 int
 qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
 {
@@ -681,6 +689,8 @@ qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
     if (def->vsock) {
         qemuAssignDeviceVsockAlias(def->vsock);
     }
+    if (def->iommu)
+        qemuAssignDeviceIOMMUAlias(def->iommu);
 
     return 0;
 }
-- 
2.35.3


From abologna at redhat.com  Thu Jul 21 09:32:29 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Thu, 21 Jul 2022 11:32:29 +0200
Subject: [libvirt PATCH 3/3] qemu: Add IOMMU device alias to command line
In-Reply-To: <20220721093229.91273-1-abologna@redhat.com>
References: <20220721093229.91273-1-abologna@redhat.com>
Message-ID: <20220721093229.91273-4-abologna@redhat.com>

Note that we can only do this for intel-iommu and virtio-iommu,
which are configured using -device; smmuv3 is configured using
a machine type property, so there's no room on the command line
for an alias in that case.

https://bugzilla.redhat.com/show_bug.cgi?id=2108483

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 src/qemu/qemu_command.c                                         | 2 ++
 tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args   | 2 +-
 .../intel-iommu-caching-mode.x86_64-latest.args                 | 2 +-
 .../intel-iommu-device-iotlb.x86_64-latest.args                 | 2 +-
 tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args       | 2 +-
 tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args           | 2 +-
 tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args | 2 +-
 tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args   | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 262fffe5fe..30c9bbbf2e 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6441,6 +6441,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd,
     case VIR_DOMAIN_IOMMU_MODEL_INTEL:
         if (virJSONValueObjectAdd(&props,
                                   "s:driver", "intel-iommu",
+                                  "s:id", iommu->info.alias,
                                   "S:intremap", qemuOnOffAuto(iommu->intremap),
                                   "T:caching-mode", iommu->caching_mode,
                                   "S:eim", qemuOnOffAuto(iommu->eim),
@@ -6457,6 +6458,7 @@ qemuBuildIOMMUCommandLine(virCommand *cmd,
     case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
         if (virJSONValueObjectAdd(&props,
                                   "s:driver", "virtio-iommu",
+                                  "s:id", iommu->info.alias,
                                   NULL) < 0) {
             return -1;
         }
diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
index f61ff3f8ff..df11e3ddab 100644
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--device '{"driver":"intel-iommu","intremap":"on","aw-bits":48}' \
+-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","aw-bits":48}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
index 083c6bfe4b..47976fa6a7 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--device '{"driver":"intel-iommu","intremap":"on","caching-mode":true}' \
+-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","caching-mode":true}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
index fc06e15191..af36c45292 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--device '{"driver":"intel-iommu","intremap":"on","device-iotlb":true}' \
+-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","device-iotlb":true}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
index c8dd31c5fe..8e2b54d1f9 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--device '{"driver":"intel-iommu","intremap":"on","eim":"on"}' \
+-device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","eim":"on"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
index db69543298..c99efd229b 100644
--- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
@@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--device '{"driver":"intel-iommu"}' \
+-device '{"driver":"intel-iommu","id":"iommu0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
index 9c1de8ae9b..54f069c350 100644
--- a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
@@ -30,7 +30,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--device '{"driver":"virtio-iommu","bus":"pcie.0","addr":"0x1"}' \
+-device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args
index 7e0aa7192d..744367c6c0 100644
--- a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args
@@ -26,7 +26,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -rtc base=utc \
 -no-shutdown \
 -boot strict=on \
--device '{"driver":"virtio-iommu","bus":"pcie.0","addr":"0x1"}' \
+-device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
-- 
2.35.3


From mprivozn at redhat.com  Thu Jul 21 10:31:40 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu, 21 Jul 2022 12:31:40 +0200
Subject: [PATCH 0/2] qemu_cgroup: Two almost trivial cleanups
Message-ID: <cover.1658399401.git.mprivozn@redhat.com>

I'm trying to fix SGX patches I reviewed earlier [1] and these would
simplify my attempts.

1: https://listman.redhat.com/archives/libvir-list/2022-July/232679.html

Michal Pr?vozn?k (2):
  qemu_cgroup: Avoid ternary operator when setting @deviceACL
  qemu_cgroup: Introduce qemuCgroupAllowDevicesPaths()

 src/qemu/qemu_cgroup.c | 54 +++++++++++++++++++++++++++++-------------
 1 file changed, 37 insertions(+), 17 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Thu Jul 21 10:31:41 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu, 21 Jul 2022 12:31:41 +0200
Subject: [PATCH 1/2] qemu_cgroup: Avoid ternary operator when setting
 @deviceACL
In-Reply-To: <cover.1658399401.git.mprivozn@redhat.com>
References: <cover.1658399401.git.mprivozn@redhat.com>
Message-ID: <4e97ea8b532289bccd7f47098f29cc9628771627.1658399401.git.mprivozn@redhat.com>

Inside of the qemuSetupDevicesCgroup() there's @deviceACL
variable, which points to a string list of devices that are
allowed in devices controller by default. This list can either
come from qemu.conf (cfg->cgroupDeviceACL) or from a builtin
@defaultDeviceACL. However, a multiline ternary operator is used
when setting the variable which is against our coding style.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_cgroup.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 2cc16a69d3..e012ba92c0 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -652,7 +652,7 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(priv->driver);
-    const char *const *deviceACL = NULL;
+    const char *const *deviceACL = (const char *const *) cfg->cgroupDeviceACL;
     int rv = -1;
     size_t i;
 
@@ -686,9 +686,8 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
     if (rv < 0)
         return -1;
 
-    deviceACL = cfg->cgroupDeviceACL ?
-                (const char *const *)cfg->cgroupDeviceACL :
-                defaultDeviceACL;
+    if (!deviceACL)
+        deviceACL = defaultDeviceACL;
 
     if (vm->def->nsounds &&
         ((!vm->def->ngraphics && cfg->nogfxAllowHostAudio) ||
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul 21 10:31:42 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu, 21 Jul 2022 12:31:42 +0200
Subject: [PATCH 2/2] qemu_cgroup: Introduce qemuCgroupAllowDevicesPaths()
In-Reply-To: <cover.1658399401.git.mprivozn@redhat.com>
References: <cover.1658399401.git.mprivozn@redhat.com>
Message-ID: <3c9fd89ab554581215e4ce0636b15e41b1b44601.1658399401.git.mprivozn@redhat.com>

We have qemuCgroupAllowDevicePath() which sets up devices
controller for just one path. And if we have more paths we have
to call it in a loop. So far, we have just one such place, but
soon we'll have another one (for SGX memory). Separate the loop
into its own function so that it can be reused.

And while at it, move setting the default set of devices as the
first thing, right after all devices are disallowed.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_cgroup.c | 51 +++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index e012ba92c0..8339caeb53 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -67,6 +67,32 @@ qemuCgroupAllowDevicePath(virDomainObj *vm,
 }
 
 
+static int
+qemuCgroupAllowDevicesPaths(virDomainObj *vm,
+                            const char *const *deviceACL,
+                            int perms,
+                            bool ignoreEacces)
+{
+    size_t i;
+
+    for (i = 0; deviceACL[i] != NULL; i++) {
+        int rv;
+
+        if (!virFileExists(deviceACL[i])) {
+            VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]);
+            continue;
+        }
+
+        rv = qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces);
+        if (rv < 0 &&
+            !virLastErrorIsSystemErrno(ENOENT))
+            return -1;
+    }
+
+    return 0;
+}
+
+
 static int
 qemuCgroupDenyDevicePath(virDomainObj *vm,
                          const char *path,
@@ -659,6 +685,10 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
     if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
         return 0;
 
+    deviceACL = cfg->cgroupDeviceACL ?
+                (const char *const *)cfg->cgroupDeviceACL :
+                defaultDeviceACL;
+
     rv = virCgroupDenyAllDevices(priv->cgroup);
     virDomainAuditCgroup(vm, priv->cgroup, "deny", "all", rv == 0);
     if (rv < 0) {
@@ -671,6 +701,12 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
         return -1;
     }
 
+    if (!deviceACL)
+        deviceACL = defaultDeviceACL;
+
+    if (qemuCgroupAllowDevicesPaths(vm, deviceACL, VIR_CGROUP_DEVICE_RW, false) < 0)
+        return -1;
+
     if (qemuSetupFirmwareCgroup(vm) < 0)
         return -1;
 
@@ -686,9 +722,6 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
     if (rv < 0)
         return -1;
 
-    if (!deviceACL)
-        deviceACL = defaultDeviceACL;
-
     if (vm->def->nsounds &&
         ((!vm->def->ngraphics && cfg->nogfxAllowHostAudio) ||
          (vm->def->graphics &&
@@ -703,18 +736,6 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
             return -1;
     }
 
-    for (i = 0; deviceACL[i] != NULL; i++) {
-        if (!virFileExists(deviceACL[i])) {
-            VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]);
-            continue;
-        }
-
-        rv = qemuCgroupAllowDevicePath(vm, deviceACL[i], VIR_CGROUP_DEVICE_RW, false);
-        if (rv < 0 &&
-            !virLastErrorIsSystemErrno(ENOENT))
-            return -1;
-    }
-
     if (virDomainChrDefForeach(vm->def,
                                true,
                                qemuSetupChardevCgroupCB,
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul 21 10:45:29 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 21 Jul 2022 12:45:29 +0200
Subject: [PATCH 2/2] qemu_cgroup: Introduce qemuCgroupAllowDevicesPaths()
In-Reply-To: <3c9fd89ab554581215e4ce0636b15e41b1b44601.1658399401.git.mprivozn@redhat.com>
References: <cover.1658399401.git.mprivozn@redhat.com>
 <3c9fd89ab554581215e4ce0636b15e41b1b44601.1658399401.git.mprivozn@redhat.com>
Message-ID: <764744fe-189b-adca-3a88-9747de05b8e6@redhat.com>

On 7/21/22 12:31, Michal Privoznik wrote:
> We have qemuCgroupAllowDevicePath() which sets up devices
> controller for just one path. And if we have more paths we have
> to call it in a loop. So far, we have just one such place, but
> soon we'll have another one (for SGX memory). Separate the loop
> into its own function so that it can be reused.
> 
> And while at it, move setting the default set of devices as the
> first thing, right after all devices are disallowed.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_cgroup.c | 51 +++++++++++++++++++++++++++++-------------
>  1 file changed, 36 insertions(+), 15 deletions(-)
> 
> diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
> index e012ba92c0..8339caeb53 100644
> --- a/src/qemu/qemu_cgroup.c
> +++ b/src/qemu/qemu_cgroup.c
> @@ -67,6 +67,32 @@ qemuCgroupAllowDevicePath(virDomainObj *vm,
>  }
>  
>  
> +static int
> +qemuCgroupAllowDevicesPaths(virDomainObj *vm,
> +                            const char *const *deviceACL,
> +                            int perms,
> +                            bool ignoreEacces)
> +{
> +    size_t i;
> +
> +    for (i = 0; deviceACL[i] != NULL; i++) {
> +        int rv;
> +
> +        if (!virFileExists(deviceACL[i])) {
> +            VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]);
> +            continue;
> +        }
> +
> +        rv = qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces);
> +        if (rv < 0 &&
> +            !virLastErrorIsSystemErrno(ENOENT))
> +            return -1;
> +    }
> +
> +    return 0;
> +}
> +
> +
>  static int
>  qemuCgroupDenyDevicePath(virDomainObj *vm,
>                           const char *path,
> @@ -659,6 +685,10 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
>      if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
>          return 0;
>  
> +    deviceACL = cfg->cgroupDeviceACL ?
> +                (const char *const *)cfg->cgroupDeviceACL :
> +                defaultDeviceACL;
> +

OOOps, this hunk does not belong here. I've screwed up conflict
resolution. Consider fixed locally.

Michal


From khanicov at redhat.com  Thu Jul 21 10:45:45 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:45 +0200
Subject: [PATCH v2 0/8] domain_conf & domain_capabilities: small refactoring
Message-ID: <cover.1658400080.git.khanicov@redhat.com>

diff to v1:
* dropped 1 wrong commit (thanks Daniel)
* improved setting of the variable (suggested by Peter, Michal, Martin)
* extended the switch to include all cases instead of simple if to be
  future proof (suggested by Peter)

v1:
https://listman.redhat.com/archives/libvir-list/2022-July/232991.html

Kristina Hanicova (8):
  domain_capabilities: use early return in
    virDomainCapsFeatureSEVFormat()
  domain_capabilities: reformat virDomainCapsFeatureSEVFormat()
  domain_capabilities: reformat virDomainCapsCPUCustomFormat()
  domain_conf: remove breaks after return in
    virDomainChrSourceDefIsEqual()
  domain_conf: extend switch with if in virDomainChrDefFree()
  domain_conf: use early return in virDomainObjAssignDef()
  domain_conf: rewrite conditions in virDomainObjWaitUntil()
  domain_conf: rewrite variable setting

 src/conf/domain_capabilities.c | 37 ++++++++---------
 src/conf/domain_conf.c         | 76 +++++++++++++++++-----------------
 2 files changed, 55 insertions(+), 58 deletions(-)

-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:46 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:46 +0200
Subject: [PATCH v2 1/8] domain_capabilities: use early return in
 virDomainCapsFeatureSEVFormat()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <8aea3aa9386985fb3d239e4e3be2f4fae477dbef.1658400080.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_capabilities.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 33570a51db..bb36a956db 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -590,25 +590,24 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
 {
     if (!sev) {
         virBufferAddLit(buf, "<sev supported='no'/>\n");
-    } else {
-        virBufferAddLit(buf, "<sev supported='yes'>\n");
-        virBufferAdjustIndent(buf, 2);
-        virBufferAsprintf(buf, "<cbitpos>%d</cbitpos>\n", sev->cbitpos);
-        virBufferAsprintf(buf, "<reducedPhysBits>%d</reducedPhysBits>\n",
-                          sev->reduced_phys_bits);
-        virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n",
-                          sev->max_guests);
-        virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n",
-                          sev->max_es_guests);
-        if (sev->cpu0_id != NULL) {
-            virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n",
-                              sev->cpu0_id);
-        }
-        virBufferAdjustIndent(buf, -2);
-        virBufferAddLit(buf, "</sev>\n");
+        return;
     }
 
-    return;
+    virBufferAddLit(buf, "<sev supported='yes'>\n");
+    virBufferAdjustIndent(buf, 2);
+    virBufferAsprintf(buf, "<cbitpos>%d</cbitpos>\n", sev->cbitpos);
+    virBufferAsprintf(buf, "<reducedPhysBits>%d</reducedPhysBits>\n",
+                      sev->reduced_phys_bits);
+    virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n",
+                      sev->max_guests);
+    virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n",
+                      sev->max_es_guests);
+    if (sev->cpu0_id != NULL) {
+        virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n",
+                          sev->cpu0_id);
+    }
+    virBufferAdjustIndent(buf, -2);
+    virBufferAddLit(buf, "</sev>\n");
 }
 
 
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:49 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:49 +0200
Subject: [PATCH v2 4/8] domain_conf: remove breaks after return in
 virDomainChrSourceDefIsEqual()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <e80f9e006fb225045f0ced3911235d4f69a90c54.1658400080.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 26a241db38..b903dac1cb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2844,21 +2844,22 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
     case VIR_DOMAIN_CHR_TYPE_FILE:
         return src->data.file.append == tgt->data.file.append &&
             STREQ_NULLABLE(src->data.file.path, tgt->data.file.path);
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_PTY:
     case VIR_DOMAIN_CHR_TYPE_DEV:
     case VIR_DOMAIN_CHR_TYPE_PIPE:
         return STREQ_NULLABLE(src->data.file.path, tgt->data.file.path);
+
     case VIR_DOMAIN_CHR_TYPE_NMDM:
         return STREQ_NULLABLE(src->data.nmdm.master, tgt->data.nmdm.master) &&
             STREQ_NULLABLE(src->data.nmdm.slave, tgt->data.nmdm.slave);
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_UDP:
         return STREQ_NULLABLE(src->data.udp.bindHost, tgt->data.udp.bindHost) &&
             STREQ_NULLABLE(src->data.udp.bindService, tgt->data.udp.bindService) &&
             STREQ_NULLABLE(src->data.udp.connectHost, tgt->data.udp.connectHost) &&
             STREQ_NULLABLE(src->data.udp.connectService, tgt->data.udp.connectService);
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_TCP:
         return src->data.tcp.listen == tgt->data.tcp.listen &&
             src->data.tcp.protocol == tgt->data.tcp.protocol &&
@@ -2866,18 +2867,16 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
             STREQ_NULLABLE(src->data.tcp.service, tgt->data.tcp.service) &&
             src->data.tcp.reconnect.enabled == tgt->data.tcp.reconnect.enabled &&
             src->data.tcp.reconnect.timeout == tgt->data.tcp.reconnect.timeout;
-        break;
+
     case VIR_DOMAIN_CHR_TYPE_UNIX:
         return src->data.nix.listen == tgt->data.nix.listen &&
             STREQ_NULLABLE(src->data.nix.path, tgt->data.nix.path) &&
             src->data.nix.reconnect.enabled == tgt->data.nix.reconnect.enabled &&
             src->data.nix.reconnect.timeout == tgt->data.nix.reconnect.timeout;
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_SPICEPORT:
         return STREQ_NULLABLE(src->data.spiceport.channel,
                               tgt->data.spiceport.channel);
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_SPICEVMC:
         return src->data.spicevmc == tgt->data.spicevmc;
@@ -2885,12 +2884,10 @@ virDomainChrSourceDefIsEqual(const virDomainChrSourceDef *src,
     case VIR_DOMAIN_CHR_TYPE_QEMU_VDAGENT:
         return src->data.qemuVdagent.clipboard == tgt->data.qemuVdagent.clipboard &&
             src->data.qemuVdagent.mouse == tgt->data.qemuVdagent.mouse;
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_DBUS:
         return STREQ_NULLABLE(src->data.dbus.channel,
                               tgt->data.dbus.channel);
-        break;
 
     case VIR_DOMAIN_CHR_TYPE_NULL:
     case VIR_DOMAIN_CHR_TYPE_VC:
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:48 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:48 +0200
Subject: [PATCH v2 3/8] domain_capabilities: reformat
 virDomainCapsCPUCustomFormat()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <91022deb3d8feed61ddc5ec03c9ce302541222a4.1658400080.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_capabilities.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 6e8f957657..653123f293 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -376,12 +376,14 @@ virDomainCapsCPUCustomFormat(virBuffer *buf,
 
     for (i = 0; i < custom->nmodels; i++) {
         virDomainCapsCPUModel *model = custom->models + i;
+
         virBufferAsprintf(buf, "<model usable='%s'",
                           virDomainCapsCPUUsableTypeToString(model->usable));
+
         if (model->deprecated)
             virBufferAddLit(buf, " deprecated='yes'");
-        virBufferAsprintf(buf, ">%s</model>\n",
-                          model->name);
+
+        virBufferAsprintf(buf, ">%s</model>\n", model->name);
     }
 
     virBufferAdjustIndent(buf, -2);
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:51 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:51 +0200
Subject: [PATCH v2 6/8] domain_conf: use early return in
 virDomainObjAssignDef()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <f3102b0e58d093922c24e666d22ee9148dc90014.1658400080.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 41eb105a6c..507bff953c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3928,22 +3928,24 @@ void virDomainObjAssignDef(virDomainObj *domain,
         else
             virDomainDefFree(domain->newDef);
         domain->newDef = g_steal_pointer(def);
-    } else {
-        if (live) {
-            /* save current configuration to be restored on domain shutdown */
-            if (!domain->newDef)
-                domain->newDef = domain->def;
-            else
-                virDomainDefFree(domain->def);
-            domain->def = g_steal_pointer(def);
-        } else {
-            if (oldDef)
-                *oldDef = domain->def;
-            else
-                virDomainDefFree(domain->def);
-            domain->def = g_steal_pointer(def);
-        }
+        return;
+    }
+
+    if (live) {
+        /* save current configuration to be restored on domain shutdown */
+        if (!domain->newDef)
+            domain->newDef = domain->def;
+        else
+            virDomainDefFree(domain->def);
+        domain->def = g_steal_pointer(def);
+        return;
     }
+
+    if (oldDef)
+        *oldDef = domain->def;
+    else
+        virDomainDefFree(domain->def);
+    domain->def = g_steal_pointer(def);
 }
 
 
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:50 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:50 +0200
Subject: [PATCH v2 5/8] domain_conf: extend switch with if in
 virDomainChrDefFree()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <a0ad50c3f91e53701b3400194ff146f7f9f28f25.1658400080.git.khanicov@redhat.com>

Switch is used for just one case, but a more future proof
approach is to handle all enum values.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b903dac1cb..41eb105a6c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2904,7 +2904,7 @@ void virDomainChrDefFree(virDomainChrDef *def)
     if (!def)
         return;
 
-    switch (def->deviceType) {
+    switch ((virDomainChrDeviceType)def->deviceType) {
     case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
         switch (def->targetType) {
         case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
@@ -2918,7 +2918,10 @@ void virDomainChrDefFree(virDomainChrDef *def)
         }
         break;
 
-    default:
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
+    case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
         break;
     }
 
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:47 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:47 +0200
Subject: [PATCH v2 2/8] domain_capabilities: reformat
 virDomainCapsFeatureSEVFormat()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <bc75ec82d886525dab264d12f0679c069ca24a5a.1658400080.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_capabilities.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index bb36a956db..6e8f957657 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -598,14 +598,12 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
     virBufferAsprintf(buf, "<cbitpos>%d</cbitpos>\n", sev->cbitpos);
     virBufferAsprintf(buf, "<reducedPhysBits>%d</reducedPhysBits>\n",
                       sev->reduced_phys_bits);
-    virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n",
-                      sev->max_guests);
-    virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n",
-                      sev->max_es_guests);
-    if (sev->cpu0_id != NULL) {
-        virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n",
-                          sev->cpu0_id);
-    }
+    virBufferAsprintf(buf, "<maxGuests>%d</maxGuests>\n", sev->max_guests);
+    virBufferAsprintf(buf, "<maxESGuests>%d</maxESGuests>\n", sev->max_es_guests);
+
+    if (sev->cpu0_id != NULL)
+        virBufferAsprintf(buf, "<cpu0Id>%s</cpu0Id>\n", sev->cpu0_id);
+
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</sev>\n");
 }
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:52 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:52 +0200
Subject: [PATCH v2 7/8] domain_conf: rewrite conditions in
 virDomainObjWaitUntil()
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <e91bd54748d1ce08916308014fb647f88da612d4.1658400080.git.khanicov@redhat.com>

This patch rewrites conditions to make the code easier and less
structured.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 507bff953c..bbe6574487 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4009,15 +4009,15 @@ int
 virDomainObjWaitUntil(virDomainObj *vm,
                       unsigned long long whenms)
 {
-    if (virCondWaitUntil(&vm->cond, &vm->parent.lock, whenms) < 0) {
-        if (errno != ETIMEDOUT) {
-            virReportSystemError(errno, "%s",
-                                 _("failed to wait for domain condition"));
-            return -1;
-        }
+    if (virCondWaitUntil(&vm->cond, &vm->parent.lock, whenms) >= 0)
+        return 0;
+
+    if (errno == ETIMEDOUT)
         return 1;
-    }
-    return 0;
+
+    virReportSystemError(errno, "%s",
+                         _("failed to wait for domain condition"));
+    return -1;
 }
 
 
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 10:45:53 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 12:45:53 +0200
Subject: [PATCH v2 8/8] domain_conf: rewrite variable setting
In-Reply-To: <cover.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
Message-ID: <97a887d2cfd18d325b55d5f364664da1f2189f2f.1658400080.git.khanicov@redhat.com>

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bbe6574487..d3872830c9 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4216,12 +4216,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
     if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
         return NULL;
 
-    if (live) {
-        if (flags & VIR_DOMAIN_AFFECT_LIVE)
-            *live = true;
-        else
-            *live = false;
-    }
+    if (live)
+        *live = flags & VIR_DOMAIN_AFFECT_LIVE;
 
     if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
         return vm->newDef;
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:30:43 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:30:43 +0200
Subject: [PATCH v2 0/2] domain_conf: rewriting else after return
Message-ID: <cover.1658402859.git.khanicov@redhat.com>

diff to v1:
* split one commit into two
* rewrite the functions in the second one to use the
  switch (suggested by Daniel, thanks)

v1: https://listman.redhat.com/archives/libvir-list/2022-July/232989.html

Kristina Hanicova (2):
  domain_conf: remove else after return / goto
  domain_conf: rewrite if else functions to switch

 src/conf/domain_conf.c | 77 +++++++++++++++++++++++++++---------------
 1 file changed, 49 insertions(+), 28 deletions(-)

-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:30:44 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:30:44 +0200
Subject: [PATCH v2 1/2] domain_conf: remove else after return / goto
In-Reply-To: <cover.1658402859.git.khanicov@redhat.com>
References: <cover.1658402859.git.khanicov@redhat.com>
Message-ID: <04882dfcfade1299a03da8e602fb3d2fc951b8ac.1658402859.git.khanicov@redhat.com>

The else branches are redundant because the execution will never
reach them if the conditions in the previous 'if' branches are
true.

I think this looks cleaner and is more readable, because having
'else' branch indicates that no return / break / goto is in the
previous branch and the function can reach it.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 26a241db38..41d23cfe2a 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4084,8 +4084,8 @@ virDomainObjGetPersistentDef(virDomainXMLOption *xmlopt,
 
     if (domain->newDef)
         return domain->newDef;
-    else
-        return domain->def;
+
+    return domain->def;
 }
 
 
@@ -4223,8 +4223,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
 
     if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
         return vm->newDef;
-    else
-        return vm->def;
+
+    return vm->def;
 }
 
 
@@ -6028,7 +6028,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
                              VIR_XML_PROP_NONZERO,
                              &scsisrc->sgio)) < 0) {
         return -1;
-    } else if (rv > 0) {
+    }
+
+    if (rv > 0) {
         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"));
@@ -6040,8 +6042,9 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
                                      VIR_XML_PROP_NONE,
                                      &scsisrc->rawio)) < 0) {
         return -1;
-    } else if (rv > 0 &&
-               def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
+    }
+
+    if (rv > 0 && def->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI) {
         virReportError(VIR_ERR_XML_ERROR, "%s",
                        _("rawio is only supported for scsi host device"));
         return -1;
@@ -9913,9 +9916,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
 
     ctxt->node = cur;
 
-    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0) {
+    if ((nsources = virXPathNodeSet("./source", ctxt, &sources)) < 0)
         goto error;
-    } else if (nsources > 0) {
+
+    if (nsources > 0) {
         /* Parse only the first source element since only one is used
          * for chardev devices, the only exception is UDP type, where
          * user can specify two source elements. */
@@ -9924,7 +9928,8 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
                            _("only one source element is allowed for "
                              "character device"));
             goto error;
-        } else if (nsources > 2) {
+        }
+        if (nsources > 2) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("only two source elements are allowed for "
                              "character device"));
@@ -10004,9 +10009,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
         }
     }
 
-    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0) {
+    if ((nlogs = virXPathNodeSet("./log", ctxt, &logs)) < 0)
         goto error;
-    } else if (nlogs == 1) {
+
+    if (nlogs == 1) {
         if (virDomainChrSourceDefParseLog(def, logs[0]) < 0)
             goto error;
     } else if (nlogs > 1) {
@@ -10016,9 +10022,10 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDef *def,
         goto error;
     }
 
-    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0) {
+    if ((nprotocols = virXPathNodeSet("./protocol", ctxt, &protocols)) < 0)
         goto error;
-    } else if (nprotocols == 1) {
+
+    if (nprotocols == 1) {
         if (virDomainChrSourceDefParseProtocol(def, protocols[0]) < 0)
             goto error;
     } else if (nprotocols > 1) {
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:30:45 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:30:45 +0200
Subject: [PATCH v2 2/2] domain_conf: rewrite if else functions to switch
In-Reply-To: <cover.1658402859.git.khanicov@redhat.com>
References: <cover.1658402859.git.khanicov@redhat.com>
Message-ID: <cedbc091d4fab9c2103877617ed5dd7fb05c5e23.1658402859.git.khanicov@redhat.com>

Pattern of using switch instead of a long if else construction is
used everywhere, so I used it here as well to make the code more
consistent (and remove that else after return). I also included
all the values from the enum.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/conf/domain_conf.c | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 41d23cfe2a..a4b3a49086 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8055,19 +8055,26 @@ static int
 virDomainControllerModelTypeFromString(const virDomainControllerDef *def,
                                        const char *model)
 {
-    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
+    switch ((virDomainControllerType)def->type) {
+    case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
         return virDomainControllerModelSCSITypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
+    case VIR_DOMAIN_CONTROLLER_TYPE_USB:
         return virDomainControllerModelUSBTypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
+    case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
         return virDomainControllerModelPCITypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
+    case VIR_DOMAIN_CONTROLLER_TYPE_IDE:
         return virDomainControllerModelIDETypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
+    case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
         return virDomainControllerModelVirtioSerialTypeFromString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
+    case VIR_DOMAIN_CONTROLLER_TYPE_ISA:
         return virDomainControllerModelISATypeFromString(model);
-
+    case VIR_DOMAIN_CONTROLLER_TYPE_FDC:
+    case VIR_DOMAIN_CONTROLLER_TYPE_SATA:
+    case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
+    case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS:
+    case VIR_DOMAIN_CONTROLLER_TYPE_LAST:
+        return -1;
+    }
     return -1;
 }
 
@@ -8076,19 +8083,26 @@ static const char *
 virDomainControllerModelTypeToString(virDomainControllerDef *def,
                                      int model)
 {
-    if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_SCSI)
+    switch ((virDomainControllerType)def->type) {
+    case VIR_DOMAIN_CONTROLLER_TYPE_SCSI:
         return virDomainControllerModelSCSITypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_USB)
+    case VIR_DOMAIN_CONTROLLER_TYPE_USB:
         return virDomainControllerModelUSBTypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_PCI)
+    case VIR_DOMAIN_CONTROLLER_TYPE_PCI:
         return virDomainControllerModelPCITypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE)
+    case VIR_DOMAIN_CONTROLLER_TYPE_IDE:
         return virDomainControllerModelIDETypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL)
+    case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL:
         return virDomainControllerModelVirtioSerialTypeToString(model);
-    else if (def->type == VIR_DOMAIN_CONTROLLER_TYPE_ISA)
+    case VIR_DOMAIN_CONTROLLER_TYPE_ISA:
         return virDomainControllerModelISATypeToString(model);
-
+    case VIR_DOMAIN_CONTROLLER_TYPE_FDC:
+    case VIR_DOMAIN_CONTROLLER_TYPE_SATA:
+    case VIR_DOMAIN_CONTROLLER_TYPE_CCID:
+    case VIR_DOMAIN_CONTROLLER_TYPE_XENBUS:
+    case VIR_DOMAIN_CONTROLLER_TYPE_LAST:
+        return NULL;
+    }
     return NULL;
 }
 
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:54:45 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:54:45 +0200
Subject: [PATCH 0/4] jobs: make & use generalized virDomainObjInitJob()
Message-ID: <cover.1658404272.git.khanicov@redhat.com>

This series uses qemuDomainObjInitJob() as virDomainObjInitJob() in all
drivers that use virDomainObjJob structure.

Kristina Hanicova (4):
  qemu & hypervisor: move qemuDomainObjInitJob() into hypervisor
  libxl: use virDomainObjInitJob()
  LXC: use virDomainObjInitJob()
  CH: use virDomainObjInitJob()

 src/ch/ch_domain.c          | 13 +------------
 src/hypervisor/domain_job.c | 25 +++++++++++++++++++++++++
 src/hypervisor/domain_job.h |  4 ++++
 src/libvirt_private.syms    |  1 +
 src/libxl/libxl_domain.c    | 17 +++--------------
 src/lxc/lxc_domain.c        | 13 +------------
 src/qemu/qemu_domain.c      |  2 +-
 src/qemu/qemu_domainjob.c   | 26 --------------------------
 src/qemu/qemu_domainjob.h   |  4 ----
 9 files changed, 36 insertions(+), 69 deletions(-)

-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:54:47 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:54:47 +0200
Subject: [PATCH 2/4] libxl: use virDomainObjInitJob()
In-Reply-To: <cover.1658404272.git.khanicov@redhat.com>
References: <cover.1658404272.git.khanicov@redhat.com>
Message-ID: <b70c89893870ae30e1abd246b61c29a3b107b5cb.1658404272.git.khanicov@redhat.com>

This patch removes and replaces libxlDomainObjInitJob() with
general virDomainObjInitJob().

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/libxl/libxl_domain.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index ce515ec54e..e2e078bd50 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -44,19 +44,6 @@
 VIR_LOG_INIT("libxl.libxl_domain");
 
 
-static int
-libxlDomainObjInitJob(libxlDomainObjPrivate *priv)
-{
-    memset(&priv->job, 0, sizeof(priv->job));
-
-    if (virCondInit(&priv->job.cond) < 0)
-        return -1;
-
-    priv->job.current = virDomainJobDataInit(NULL);
-
-    return 0;
-}
-
 static void
 libxlDomainObjResetJob(libxlDomainObjPrivate *priv)
 {
@@ -190,12 +177,14 @@ libxlDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
         return NULL;
     }
 
-    if (libxlDomainObjInitJob(priv) < 0) {
+    if (virDomainObjInitJob(&priv->job, NULL) < 0) {
         virChrdevFree(priv->devs);
         g_free(priv);
         return NULL;
     }
 
+    priv->job.current = virDomainJobDataInit(NULL);
+
     return priv;
 }
 
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:54:46 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:54:46 +0200
Subject: [PATCH 1/4] qemu & hypervisor: move qemuDomainObjInitJob() into
 hypervisor
In-Reply-To: <cover.1658404272.git.khanicov@redhat.com>
References: <cover.1658404272.git.khanicov@redhat.com>
Message-ID: <e09d004e37ff06b8d819eda0c41bb85723e893bb.1658404272.git.khanicov@redhat.com>

This patch moves qemuDomainObjInitJob() as virDomainObjInitJob()
into hypervisor in order to be used by other drivers as well.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/hypervisor/domain_job.c | 25 +++++++++++++++++++++++++
 src/hypervisor/domain_job.h |  4 ++++
 src/libvirt_private.syms    |  1 +
 src/qemu/qemu_domain.c      |  2 +-
 src/qemu/qemu_domainjob.c   | 26 --------------------------
 src/qemu/qemu_domainjob.h   |  4 ----
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c
index 6a0fbd42b3..1ee70ea11e 100644
--- a/src/hypervisor/domain_job.c
+++ b/src/hypervisor/domain_job.c
@@ -112,3 +112,28 @@ virDomainJobStatusToType(virDomainJobStatus status)
 
     return VIR_DOMAIN_JOB_NONE;
 }
+
+int
+virDomainObjInitJob(virDomainJobObj *job,
+                    virDomainObjPrivateJobCallbacks *cb)
+{
+    memset(job, 0, sizeof(*job));
+    job->cb = cb;
+
+    if (virCondInit(&job->cond) < 0)
+        return -1;
+
+    if (virCondInit(&job->asyncCond) < 0) {
+        virCondDestroy(&job->cond);
+        return -1;
+    }
+
+    if (job->cb &&
+        !(job->privateData = job->cb->allocJobPrivate())) {
+        virCondDestroy(&job->cond);
+        virCondDestroy(&job->asyncCond);
+        return -1;
+    }
+
+    return 0;
+}
diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 9c203189a6..7c65c4f8cd 100644
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -204,3 +204,7 @@ struct _virDomainObjPrivateJobCallbacks {
    virDomainObjPrivateJobFormat formatJobPrivate;
    virDomainObjPrivateJobParse parseJobPrivate;
 };
+
+
+int virDomainObjInitJob(virDomainJobObj *job,
+                        virDomainObjPrivateJobCallbacks *cb);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f4732f1742..58c05a532c 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1590,6 +1590,7 @@ virDomainJobDataInit;
 virDomainJobStatusToType;
 virDomainJobTypeFromString;
 virDomainJobTypeToString;
+virDomainObjInitJob;
 
 
 # hypervisor/virclosecallbacks.h
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2d7f6d761d..7df8041adf 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1755,7 +1755,7 @@ qemuDomainObjPrivateAlloc(void *opaque)
 {
     g_autoptr(qemuDomainObjPrivate) priv = g_new0(qemuDomainObjPrivate, 1);
 
-    if (qemuDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) {
+    if (virDomainObjInitJob(&priv->job, &qemuPrivateJobCallbacks) < 0) {
         virReportSystemError(errno, "%s",
                              _("Unable to init qemu driver mutexes"));
         return NULL;
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 82189393a2..74ea975e44 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -150,32 +150,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver,
 }
 
 
-int
-qemuDomainObjInitJob(virDomainJobObj *job,
-                     virDomainObjPrivateJobCallbacks *cb)
-{
-    memset(job, 0, sizeof(*job));
-    job->cb = cb;
-
-    if (virCondInit(&job->cond) < 0)
-        return -1;
-
-    if (virCondInit(&job->asyncCond) < 0) {
-        virCondDestroy(&job->cond);
-        return -1;
-    }
-
-    if (job->cb &&
-        !(job->privateData = job->cb->allocJobPrivate())) {
-        virCondDestroy(&job->cond);
-        virCondDestroy(&job->asyncCond);
-        return -1;
-    }
-
-    return 0;
-}
-
-
 static void
 qemuDomainObjResetJob(virDomainJobObj *job)
 {
diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index b39b04edcb..36747154c6 100644
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -138,10 +138,6 @@ bool qemuDomainTrackJob(virDomainJob job);
 void qemuDomainObjClearJob(virDomainJobObj *job);
 G_DEFINE_AUTO_CLEANUP_CLEAR_FUNC(virDomainJobObj, qemuDomainObjClearJob);
 
-int
-qemuDomainObjInitJob(virDomainJobObj *job,
-                     virDomainObjPrivateJobCallbacks *cb);
-
 int
 qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
                                  virDomainObj *vm);
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:54:49 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:54:49 +0200
Subject: [PATCH 4/4] CH: use virDomainObjInitJob()
In-Reply-To: <cover.1658404272.git.khanicov@redhat.com>
References: <cover.1658404272.git.khanicov@redhat.com>
Message-ID: <c4d338b8263a95d10ac0b2921e4acf814ca20c00.1658404272.git.khanicov@redhat.com>

This patch removes and replaces virCHDomainObjInitJob() with
general virDomainObjInitJob().

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/ch/ch_domain.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index 2afb3582b1..ae53c6fe05 100644
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -32,17 +32,6 @@
 
 VIR_LOG_INIT("ch.ch_domain");
 
-static int
-virCHDomainObjInitJob(virCHDomainObjPrivate *priv)
-{
-    memset(&priv->job, 0, sizeof(priv->job));
-
-    if (virCondInit(&priv->job.cond) < 0)
-        return -1;
-
-    return 0;
-}
-
 static void
 virCHDomainObjResetJob(virCHDomainObjPrivate *priv)
 {
@@ -143,7 +132,7 @@ virCHDomainObjPrivateAlloc(void *opaque)
 
     priv = g_new0(virCHDomainObjPrivate, 1);
 
-    if (virCHDomainObjInitJob(priv) < 0) {
+    if (virDomainObjInitJob(&priv->job, NULL) < 0) {
         g_free(priv);
         return NULL;
     }
-- 
2.35.3


From khanicov at redhat.com  Thu Jul 21 11:54:48 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 13:54:48 +0200
Subject: [PATCH 3/4] LXC: use virDomainObjInitJob()
In-Reply-To: <cover.1658404272.git.khanicov@redhat.com>
References: <cover.1658404272.git.khanicov@redhat.com>
Message-ID: <b76d5d26bb9dd75d7ae5075df55250471d993a5c.1658404272.git.khanicov@redhat.com>

This patch removes and replaces virLXCDomainObjInitJob() with
general virDomainObjInitJob().

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/lxc/lxc_domain.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index 16b667de95..fed4ae088a 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -35,17 +35,6 @@
 
 VIR_LOG_INIT("lxc.lxc_domain");
 
-static int
-virLXCDomainObjInitJob(virLXCDomainObjPrivate *priv)
-{
-    memset(&priv->job, 0, sizeof(priv->job));
-
-    if (virCondInit(&priv->job.cond) < 0)
-        return -1;
-
-    return 0;
-}
-
 static void
 virLXCDomainObjResetJob(virLXCDomainObjPrivate *priv)
 {
@@ -145,7 +134,7 @@ virLXCDomainObjPrivateAlloc(void *opaque)
 {
     virLXCDomainObjPrivate *priv = g_new0(virLXCDomainObjPrivate, 1);
 
-    if (virLXCDomainObjInitJob(priv) < 0) {
+    if (virDomainObjInitJob(&priv->job, NULL) < 0) {
         g_free(priv);
         return NULL;
     }
-- 
2.35.3


From mkletzan at redhat.com  Thu Jul 21 12:40:25 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 14:40:25 +0200
Subject: [PATCH 1/2] qemu_cgroup: Avoid ternary operator when setting
 @deviceACL
In-Reply-To: <4e97ea8b532289bccd7f47098f29cc9628771627.1658399401.git.mprivozn@redhat.com>
References: <cover.1658399401.git.mprivozn@redhat.com>
 <4e97ea8b532289bccd7f47098f29cc9628771627.1658399401.git.mprivozn@redhat.com>
Message-ID: <YtlJOae/n+KCDaDr@wheatley>

On Thu, Jul 21, 2022 at 12:31:41PM +0200, Michal Privoznik wrote:
>Inside of the qemuSetupDevicesCgroup() there's @deviceACL
>variable, which points to a string list of devices that are
>allowed in devices controller by default. This list can either
>come from qemu.conf (cfg->cgroupDeviceACL) or from a builtin
>@defaultDeviceACL. However, a multiline ternary operator is used
>when setting the variable which is against our coding style.
>
>Signed-off-by: Michal Privoznik <mprivozn at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/e64abf03/attachment.sig>

From mkletzan at redhat.com  Thu Jul 21 12:40:49 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 14:40:49 +0200
Subject: [PATCH 2/2] qemu_cgroup: Introduce qemuCgroupAllowDevicesPaths()
In-Reply-To: <764744fe-189b-adca-3a88-9747de05b8e6@redhat.com>
References: <cover.1658399401.git.mprivozn@redhat.com>
 <3c9fd89ab554581215e4ce0636b15e41b1b44601.1658399401.git.mprivozn@redhat.com>
 <764744fe-189b-adca-3a88-9747de05b8e6@redhat.com>
Message-ID: <YtlJUWWgC0OacDMu@wheatley>

On Thu, Jul 21, 2022 at 12:45:29PM +0200, Michal Pr?vozn?k wrote:
>On 7/21/22 12:31, Michal Privoznik wrote:
>> We have qemuCgroupAllowDevicePath() which sets up devices
>> controller for just one path. And if we have more paths we have
>> to call it in a loop. So far, we have just one such place, but
>> soon we'll have another one (for SGX memory). Separate the loop
>> into its own function so that it can be reused.
>>
>> And while at it, move setting the default set of devices as the
>> first thing, right after all devices are disallowed.
>>
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
>>  src/qemu/qemu_cgroup.c | 51 +++++++++++++++++++++++++++++-------------
>>  1 file changed, 36 insertions(+), 15 deletions(-)
>>
>> diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
>> index e012ba92c0..8339caeb53 100644
>> --- a/src/qemu/qemu_cgroup.c
>> +++ b/src/qemu/qemu_cgroup.c
>> @@ -67,6 +67,32 @@ qemuCgroupAllowDevicePath(virDomainObj *vm,
>>  }
>>
>>
>> +static int
>> +qemuCgroupAllowDevicesPaths(virDomainObj *vm,
>> +                            const char *const *deviceACL,
>> +                            int perms,
>> +                            bool ignoreEacces)
>> +{
>> +    size_t i;
>> +
>> +    for (i = 0; deviceACL[i] != NULL; i++) {
>> +        int rv;
>> +
>> +        if (!virFileExists(deviceACL[i])) {
>> +            VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]);
>> +            continue;
>> +        }
>> +
>> +        rv = qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces);
>> +        if (rv < 0 &&
>> +            !virLastErrorIsSystemErrno(ENOENT))
>> +            return -1;
>> +    }
>> +
>> +    return 0;
>> +}
>> +
>> +
>>  static int
>>  qemuCgroupDenyDevicePath(virDomainObj *vm,
>>                           const char *path,
>> @@ -659,6 +685,10 @@ qemuSetupDevicesCgroup(virDomainObj *vm)
>>      if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
>>          return 0;
>>
>> +    deviceACL = cfg->cgroupDeviceACL ?
>> +                (const char *const *)cfg->cgroupDeviceACL :
>> +                defaultDeviceACL;
>> +
>
>OOOps, this hunk does not belong here. I've screwed up conflict
>resolution. Consider fixed locally.
>

With this hunk removed

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/c24c3061/attachment.sig>

From mkletzan at redhat.com  Thu Jul 21 12:58:11 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 14:58:11 +0200
Subject: [PATCH v2 2/2] domain_conf: rewrite if else functions to switch
In-Reply-To: <cedbc091d4fab9c2103877617ed5dd7fb05c5e23.1658402859.git.khanicov@redhat.com>
References: <cover.1658402859.git.khanicov@redhat.com>
 <cedbc091d4fab9c2103877617ed5dd7fb05c5e23.1658402859.git.khanicov@redhat.com>
Message-ID: <YtlNY6XLb+PMwuxT@wheatley>

On Thu, Jul 21, 2022 at 01:30:45PM +0200, Kristina Hanicova wrote:
>Pattern of using switch instead of a long if else construction is
>used everywhere, so I used it here as well to make the code more
>consistent (and remove that else after return). I also included
>all the values from the enum.
>

The commit messages are usually non-subjective, as in:

"... use it here..." and "Also include ...", but it's not a rule.

>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/0d63e050/attachment.sig>

From mkletzan at redhat.com  Thu Jul 21 12:58:24 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 14:58:24 +0200
Subject: [PATCH v2 1/2] domain_conf: remove else after return / goto
In-Reply-To: <04882dfcfade1299a03da8e602fb3d2fc951b8ac.1658402859.git.khanicov@redhat.com>
References: <cover.1658402859.git.khanicov@redhat.com>
 <04882dfcfade1299a03da8e602fb3d2fc951b8ac.1658402859.git.khanicov@redhat.com>
Message-ID: <YtlNcD7E8HbYGcpE@wheatley>

On Thu, Jul 21, 2022 at 01:30:44PM +0200, Kristina Hanicova wrote:
>The else branches are redundant because the execution will never
>reach them if the conditions in the previous 'if' branches are
>true.
>
>I think this looks cleaner and is more readable, because having
>'else' branch indicates that no return / break / goto is in the
>previous branch and the function can reach it.
>
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/764bf79c/attachment.sig>

From jdenemar at redhat.com  Thu Jul 21 13:05:49 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Thu, 21 Jul 2022 15:05:49 +0200
Subject: [libvirt PATCH] qemu_migration: Use EnterMonitorAsync in
 qemuDomainGetMigrationBlockers
Message-ID: <c2ac268f8f516b87fabeaa954679955d3afd18ce.1658408749.git.jdenemar@redhat.com>

The code is run with an async job and thus needs to make sure a nested
job is acquired before entering the monitor.

While touching the code in qemuMigrationSrcIsAllowed I also fixed the
grammar which was accidentally broken by v8.5.0-140-g2103807e33.

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 5d1e5f987b..d83db3a824 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1418,12 +1418,15 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
 static int
 qemuDomainGetMigrationBlockers(virQEMUDriver *driver,
                                virDomainObj *vm,
+                               int asyncJob,
                                char ***blockers)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     int rc;
 
-    qemuDomainObjEnterMonitor(driver, vm);
+    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
+        return -1;
+
     rc = qemuMonitorGetMigrationBlockers(priv->mon, blockers);
     qemuDomainObjExitMonitor(vm);
 
@@ -1458,10 +1461,12 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
     bool blockedReasonsCap = virQEMUCapsGet(priv->qemuCaps,
                                             QEMU_CAPS_MIGRATION_BLOCKED_REASONS);
 
-    /* Ask qemu if it have a migration blocker */
+    /* Ask qemu if it has a migration blocker */
     if (blockedReasonsCap) {
         g_auto(GStrv) blockers = NULL;
-        if (qemuDomainGetMigrationBlockers(driver, vm, &blockers) < 0)
+        if (qemuDomainGetMigrationBlockers(driver, vm,
+                                           VIR_ASYNC_JOB_MIGRATION_OUT,
+                                           &blockers) < 0)
             return false;
 
         if (blockers && blockers[0]) {
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul 21 13:12:05 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 21 Jul 2022 15:12:05 +0200
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <YtkJITO+5QjumAQW@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
Message-ID: <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>

On 7/21/22 10:06, Daniel P. Berrang? wrote:
> On Wed, Jul 20, 2022 at 11:12:56PM +0000, Yang, Lin A wrote:
>>> This version is a bit better than the previous one. But we're at version
>>> 13 and I am still unable to even start a guest. Please, make sure that this
>>> basic functionality works in v14, because this is plain waste of precious
>>> review bandwidth.
>>>
>>> Anyway, as usual, I've uploaded my suggested fixes here:
>>>
>>> https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx/
>>
>> Sorry to hear it didn't work in your environment. We definitely tested it
>> several times and it works well for both QEMU 6.2.0 and 7.0.0.

Alright, I finally made it work. The problem was with memfd backend.
I'll post patch for that soon.

>>
>> Let me try to reproduce it with the domain xml you shared before.
>>
>> By my best guess, if you see "qemu-system-x86_64:***: 
>> invalid object type: memory-backend-epc" error, it means QEMU didn't
>> get enough permission to launch SGX VM.
>>
>> Pls add /dev/sgx_vepc, /dev/sgx_enclave and /dev/sgx_provision to the 
>> "cgroup_device_acl" list in /etc/libvirt/qemu.conf. QEMU requires those access
>> to assign EPC, but it was denied  by libvirt?s cgroup controllers by default.
>>
>> cgroup_device_acl = [  
>>     "/dev/null", "/dev/full", "/dev/zero",  
>>     ...
>>     "/dev/sgx_vepc", 
>>     "/dev/sgx_enclave?, 
>>     "/dev/sgx_provision? 
>> ] 
>>
>> Also in /etc/libvirt/qemu.conf, set the runtime user to uid 0,  since QEMU needs to
>> read and write to those sgx devices, like /dev/sgx_vepc. Unfortunately, it is owned
>> by root with file mode 600, so QEMU has to launch as root. 
>>
>> user = "+0"
>>
>> It would be really helpful if you can use these steps to see whether it resolve 
>> the issue. I will add a doc somewhere to include all steps are required for use to
>> use sgx in libvirt.
> 
> The need to customize qemu.conf to change cgroups ACLs and set uid==0 makes
> this patch series unusal in the real world deployments. It cannot be merged
> with such problems existing.
> 

Agreed. While libvirt can allow /dev/sgx* in CGroups (we do that for
other devices, including NVDIMM and virtio-pmem types of <memory/>),
it's more tricky with relabelling.

By default, when available, libvirt creates a separate mount namespace
for each QEMU process and creates a very small /dev there, with only
those nodes that QEMU needs. Now, if libvirt is fixed (I have follow up
patches on top of this series) the /dev/sgx* nodes are created there AND
I have another patch that sets DAC/SELinux label on them so that uid=0
is no longer needed. What I worry about though, is the case when this
namespace feature is disabled. Then libvirt should not touch /dev/sgx*
because that might compromise security in the system.

> Are the /dev/sgx* fundamentally required to be restricted to root access
> only, or is it safe to make them accessible to non-root ? ie If a malicious
> user has access to those files, what is the impact they have ? Bear in mind
> that QEMU itself can be malicious if the guest compromises it.

If we get an agreement here, I can cleanup this v13 and post v14 that
include all patches mentioned.

Michal


From mprivozn at redhat.com  Thu Jul 21 13:12:45 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 21 Jul 2022 15:12:45 +0200
Subject: [libvirt PATCH] qemu_migration: Use EnterMonitorAsync in
 qemuDomainGetMigrationBlockers
In-Reply-To: <c2ac268f8f516b87fabeaa954679955d3afd18ce.1658408749.git.jdenemar@redhat.com>
References: <c2ac268f8f516b87fabeaa954679955d3afd18ce.1658408749.git.jdenemar@redhat.com>
Message-ID: <f4de5997-61bd-a622-d04b-5c59be45e80e@redhat.com>

On 7/21/22 15:05, Jiri Denemark wrote:
> The code is run with an async job and thus needs to make sure a nested
> job is acquired before entering the monitor.
> 
> While touching the code in qemuMigrationSrcIsAllowed I also fixed the
> grammar which was accidentally broken by v8.5.0-140-g2103807e33.
> 
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From berrange at redhat.com  Thu Jul 21 13:24:24 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 21 Jul 2022 14:24:24 +0100
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
Message-ID: <YtlTiOq09a2h+kg7@redhat.com>

On Thu, Jul 21, 2022 at 03:12:05PM +0200, Michal Pr?vozn?k wrote:
> On 7/21/22 10:06, Daniel P. Berrang? wrote:
> > On Wed, Jul 20, 2022 at 11:12:56PM +0000, Yang, Lin A wrote:
> >>> This version is a bit better than the previous one. But we're at version
> >>> 13 and I am still unable to even start a guest. Please, make sure that this
> >>> basic functionality works in v14, because this is plain waste of precious
> >>> review bandwidth.
> >>>
> >>> Anyway, as usual, I've uploaded my suggested fixes here:
> >>>
> >>> https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx/
> >>
> >> Sorry to hear it didn't work in your environment. We definitely tested it
> >> several times and it works well for both QEMU 6.2.0 and 7.0.0.
> 
> Alright, I finally made it work. The problem was with memfd backend.
> I'll post patch for that soon.
> 
> >>
> >> Let me try to reproduce it with the domain xml you shared before.
> >>
> >> By my best guess, if you see "qemu-system-x86_64:***: 
> >> invalid object type: memory-backend-epc" error, it means QEMU didn't
> >> get enough permission to launch SGX VM.
> >>
> >> Pls add /dev/sgx_vepc, /dev/sgx_enclave and /dev/sgx_provision to the 
> >> "cgroup_device_acl" list in /etc/libvirt/qemu.conf. QEMU requires those access
> >> to assign EPC, but it was denied  by libvirt?s cgroup controllers by default.
> >>
> >> cgroup_device_acl = [  
> >>     "/dev/null", "/dev/full", "/dev/zero",  
> >>     ...
> >>     "/dev/sgx_vepc", 
> >>     "/dev/sgx_enclave?, 
> >>     "/dev/sgx_provision? 
> >> ] 
> >>
> >> Also in /etc/libvirt/qemu.conf, set the runtime user to uid 0,  since QEMU needs to
> >> read and write to those sgx devices, like /dev/sgx_vepc. Unfortunately, it is owned
> >> by root with file mode 600, so QEMU has to launch as root. 
> >>
> >> user = "+0"
> >>
> >> It would be really helpful if you can use these steps to see whether it resolve 
> >> the issue. I will add a doc somewhere to include all steps are required for use to
> >> use sgx in libvirt.
> > 
> > The need to customize qemu.conf to change cgroups ACLs and set uid==0 makes
> > this patch series unusal in the real world deployments. It cannot be merged
> > with such problems existing.
> > 
> 
> Agreed. While libvirt can allow /dev/sgx* in CGroups (we do that for
> other devices, including NVDIMM and virtio-pmem types of <memory/>),
> it's more tricky with relabelling.
> 
> By default, when available, libvirt creates a separate mount namespace
> for each QEMU process and creates a very small /dev there, with only
> those nodes that QEMU needs. Now, if libvirt is fixed (I have follow up
> patches on top of this series) the /dev/sgx* nodes are created there AND
> I have another patch that sets DAC/SELinux label on them so that uid=0
> is no longer needed. What I worry about though, is the case when this
> namespace feature is disabled. Then libvirt should not touch /dev/sgx*
> because that might compromise security in the system.

That might in turn require the ability to pass in pre-opened FDs for
the devices to QEMU.

> 
> > Are the /dev/sgx* fundamentally required to be restricted to root access
> > only, or is it safe to make them accessible to non-root ? ie If a malicious
> > user has access to those files, what is the impact they have ? Bear in mind
> > that QEMU itself can be malicious if the guest compromises it.
> 
> If we get an agreement here, I can cleanup this v13 and post v14 that
> include all patches mentioned.
> 
> Michal
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mprivozn at redhat.com  Thu Jul 21 14:10:11 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 21 Jul 2022 16:10:11 +0200
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <YtlTiOq09a2h+kg7@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
Message-ID: <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>

On 7/21/22 15:24, Daniel P. Berrang? wrote:
> On Thu, Jul 21, 2022 at 03:12:05PM +0200, Michal Pr?vozn?k wrote:
>> On 7/21/22 10:06, Daniel P. Berrang? wrote:
>>> On Wed, Jul 20, 2022 at 11:12:56PM +0000, Yang, Lin A wrote:
>>>>> This version is a bit better than the previous one. But we're at version
>>>>> 13 and I am still unable to even start a guest. Please, make sure that this
>>>>> basic functionality works in v14, because this is plain waste of precious
>>>>> review bandwidth.
>>>>>
>>>>> Anyway, as usual, I've uploaded my suggested fixes here:
>>>>>
>>>>> https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx/
>>>>
>>>> Sorry to hear it didn't work in your environment. We definitely tested it
>>>> several times and it works well for both QEMU 6.2.0 and 7.0.0.
>>
>> Alright, I finally made it work. The problem was with memfd backend.
>> I'll post patch for that soon.
>>
>>>>
>>>> Let me try to reproduce it with the domain xml you shared before.
>>>>
>>>> By my best guess, if you see "qemu-system-x86_64:***: 
>>>> invalid object type: memory-backend-epc" error, it means QEMU didn't
>>>> get enough permission to launch SGX VM.
>>>>
>>>> Pls add /dev/sgx_vepc, /dev/sgx_enclave and /dev/sgx_provision to the 
>>>> "cgroup_device_acl" list in /etc/libvirt/qemu.conf. QEMU requires those access
>>>> to assign EPC, but it was denied  by libvirt?s cgroup controllers by default.
>>>>
>>>> cgroup_device_acl = [  
>>>>     "/dev/null", "/dev/full", "/dev/zero",  
>>>>     ...
>>>>     "/dev/sgx_vepc", 
>>>>     "/dev/sgx_enclave?, 
>>>>     "/dev/sgx_provision? 

BTW: I can see in QEMU sources /dev/sgx_vepc and /dev/sgx_provision
being opened, but not sgx_enclave. And I see the former two on my system
but not the last one. Can you Yang, share more info on this please?

>>>> ] 
>>>>
>>>> Also in /etc/libvirt/qemu.conf, set the runtime user to uid 0,  since QEMU needs to
>>>> read and write to those sgx devices, like /dev/sgx_vepc. Unfortunately, it is owned
>>>> by root with file mode 600, so QEMU has to launch as root. 
>>>>
>>>> user = "+0"
>>>>
>>>> It would be really helpful if you can use these steps to see whether it resolve 
>>>> the issue. I will add a doc somewhere to include all steps are required for use to
>>>> use sgx in libvirt.
>>>
>>> The need to customize qemu.conf to change cgroups ACLs and set uid==0 makes
>>> this patch series unusal in the real world deployments. It cannot be merged
>>> with such problems existing.
>>>
>>
>> Agreed. While libvirt can allow /dev/sgx* in CGroups (we do that for
>> other devices, including NVDIMM and virtio-pmem types of <memory/>),
>> it's more tricky with relabelling.
>>
>> By default, when available, libvirt creates a separate mount namespace
>> for each QEMU process and creates a very small /dev there, with only
>> those nodes that QEMU needs. Now, if libvirt is fixed (I have follow up
>> patches on top of this series) the /dev/sgx* nodes are created there AND
>> I have another patch that sets DAC/SELinux label on them so that uid=0
>> is no longer needed. What I worry about though, is the case when this
>> namespace feature is disabled. Then libvirt should not touch /dev/sgx*
>> because that might compromise security in the system.
> 
> That might in turn require the ability to pass in pre-opened FDs for
> the devices to QEMU.

Yeah, that might be the perfect solution, but IIUC there's currently no
way to achieve that, or is it? Is it something we should do in QEMU first?

Michal


From mkletzan at redhat.com  Thu Jul 21 14:21:19 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 16:21:19 +0200
Subject: [PATCH v2 1/8] domain_capabilities: use early return in
 virDomainCapsFeatureSEVFormat()
In-Reply-To: <8aea3aa9386985fb3d239e4e3be2f4fae477dbef.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <8aea3aa9386985fb3d239e4e3be2f4fae477dbef.1658400080.git.khanicov@redhat.com>
Message-ID: <Ytlg39nmk0q1FXEl@wheatley>

On Thu, Jul 21, 2022 at 12:45:46PM +0200, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/e8c96c2a/attachment-0001.sig>

From mkletzan at redhat.com  Thu Jul 21 14:22:33 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 16:22:33 +0200
Subject: [PATCH v2 2/8] domain_capabilities: reformat
 virDomainCapsFeatureSEVFormat()
In-Reply-To: <bc75ec82d886525dab264d12f0679c069ca24a5a.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <bc75ec82d886525dab264d12f0679c069ca24a5a.1658400080.git.khanicov@redhat.com>
Message-ID: <YtlhKQMw/iHZBSNQ@wheatley>

On Thu, Jul 21, 2022 at 12:45:47PM +0200, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/49adafba/attachment.sig>

From berrange at redhat.com  Thu Jul 21 14:29:48 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 21 Jul 2022 15:29:48 +0100
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
 <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
Message-ID: <Ytli3Fe8b6UMae5A@redhat.com>

On Thu, Jul 21, 2022 at 04:10:11PM +0200, Michal Pr?vozn?k wrote:
> On 7/21/22 15:24, Daniel P. Berrang? wrote:
> > On Thu, Jul 21, 2022 at 03:12:05PM +0200, Michal Pr?vozn?k wrote:
> >> On 7/21/22 10:06, Daniel P. Berrang? wrote:
> >> Agreed. While libvirt can allow /dev/sgx* in CGroups (we do that for
> >> other devices, including NVDIMM and virtio-pmem types of <memory/>),
> >> it's more tricky with relabelling.
> >>
> >> By default, when available, libvirt creates a separate mount namespace
> >> for each QEMU process and creates a very small /dev there, with only
> >> those nodes that QEMU needs. Now, if libvirt is fixed (I have follow up
> >> patches on top of this series) the /dev/sgx* nodes are created there AND
> >> I have another patch that sets DAC/SELinux label on them so that uid=0
> >> is no longer needed. What I worry about though, is the case when this
> >> namespace feature is disabled. Then libvirt should not touch /dev/sgx*
> >> because that might compromise security in the system.
> > 
> > That might in turn require the ability to pass in pre-opened FDs for
> > the devices to QEMU.
> 
> Yeah, that might be the perfect solution, but IIUC there's currently no
> way to achieve that, or is it? Is it something we should do in QEMU first?

The code uses 'qemu_open', so it should be possible already with
FD passing, by using a /dev/fdset/NNN path.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mkletzan at redhat.com  Thu Jul 21 14:55:42 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 16:55:42 +0200
Subject: [PATCH v2 3/8] domain_capabilities: reformat
 virDomainCapsCPUCustomFormat()
In-Reply-To: <91022deb3d8feed61ddc5ec03c9ce302541222a4.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <91022deb3d8feed61ddc5ec03c9ce302541222a4.1658400080.git.khanicov@redhat.com>
Message-ID: <Ytlo7sLd1VdznwAV@wheatley>

On Thu, Jul 21, 2022 at 12:45:48PM +0200, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

I was thinking if this would look nicer with virXMLFormatElement, but
then I realised it's just a two lines of code and it does not matter at
all =)

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>


>---
> src/conf/domain_capabilities.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
>index 6e8f957657..653123f293 100644
>--- a/src/conf/domain_capabilities.c
>+++ b/src/conf/domain_capabilities.c
>@@ -376,12 +376,14 @@ virDomainCapsCPUCustomFormat(virBuffer *buf,
>
>     for (i = 0; i < custom->nmodels; i++) {
>         virDomainCapsCPUModel *model = custom->models + i;
>+
>         virBufferAsprintf(buf, "<model usable='%s'",
>                           virDomainCapsCPUUsableTypeToString(model->usable));
>+
>         if (model->deprecated)
>             virBufferAddLit(buf, " deprecated='yes'");
>-        virBufferAsprintf(buf, ">%s</model>\n",
>-                          model->name);
>+
>+        virBufferAsprintf(buf, ">%s</model>\n", model->name);
>     }
>
>     virBufferAdjustIndent(buf, -2);
>-- 
>2.35.3
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/e9108633/attachment.sig>

From mkletzan at redhat.com  Thu Jul 21 14:56:44 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 16:56:44 +0200
Subject: [PATCH v2 4/8] domain_conf: remove breaks after return in
 virDomainChrSourceDefIsEqual()
In-Reply-To: <e80f9e006fb225045f0ced3911235d4f69a90c54.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <e80f9e006fb225045f0ced3911235d4f69a90c54.1658400080.git.khanicov@redhat.com>
Message-ID: <YtlpLPURySTZETLi@wheatley>

On Thu, Jul 21, 2022 at 12:45:49PM +0200, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/16a5890e/attachment.sig>

From khanicov at redhat.com  Thu Jul 21 15:04:43 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Thu, 21 Jul 2022 17:04:43 +0200
Subject: [PATCH v2 5/8] domain_conf: extend switch with if in
 virDomainChrDefFree()
In-Reply-To: <a0ad50c3f91e53701b3400194ff146f7f9f28f25.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <a0ad50c3f91e53701b3400194ff146f7f9f28f25.1658400080.git.khanicov@redhat.com>
Message-ID: <CAJEdO+1+qcdA6ueuXM=s4quyFCvdGuN5XX1Yo6wKTkbhhoihZQ@mail.gmail.com>

sorry for the confusing commit message, it should have been "domain_conf:
extend switch in virDomainChrDefFree()" only:D

Kristina

On Thu, Jul 21, 2022 at 12:46 PM Kristina Hanicova <khanicov at redhat.com>
wrote:

> Switch is used for just one case, but a more future proof
> approach is to handle all enum values.
>
> Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
> ---
>  src/conf/domain_conf.c | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index b903dac1cb..41eb105a6c 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -2904,7 +2904,7 @@ void virDomainChrDefFree(virDomainChrDef *def)
>      if (!def)
>          return;
>
> -    switch (def->deviceType) {
> +    switch ((virDomainChrDeviceType)def->deviceType) {
>      case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL:
>          switch (def->targetType) {
>          case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
> @@ -2918,7 +2918,10 @@ void virDomainChrDefFree(virDomainChrDef *def)
>          }
>          break;
>
> -    default:
> +    case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
> +    case VIR_DOMAIN_CHR_DEVICE_TYPE_SERIAL:
> +    case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
> +    case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST:
>          break;
>      }
>
> --
> 2.35.3
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/3aec4ba1/attachment-0001.htm>

From mkletzan at redhat.com  Thu Jul 21 15:08:57 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 17:08:57 +0200
Subject: [PATCH v2 5/8] domain_conf: extend switch with if in
 virDomainChrDefFree()
In-Reply-To: <CAJEdO+1+qcdA6ueuXM=s4quyFCvdGuN5XX1Yo6wKTkbhhoihZQ@mail.gmail.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <a0ad50c3f91e53701b3400194ff146f7f9f28f25.1658400080.git.khanicov@redhat.com>
 <CAJEdO+1+qcdA6ueuXM=s4quyFCvdGuN5XX1Yo6wKTkbhhoihZQ@mail.gmail.com>
Message-ID: <YtlsCXXUEzoOZ3zN@wheatley>

On Thu, Jul 21, 2022 at 05:04:43PM +0200, Kristina Hanicova wrote:
>sorry for the confusing commit message, it should have been "domain_conf:
>extend switch in virDomainChrDefFree()" only:D
>

ok, with that and ...

>Kristina
>
>On Thu, Jul 21, 2022 at 12:46 PM Kristina Hanicova <khanicov at redhat.com>
>wrote:
>
>> Switch is used for just one case, but a more future proof
>> approach is to handle all enum values.
>>

... without this

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/4264b1e0/attachment.sig>

From mprivozn at redhat.com  Thu Jul 21 15:09:15 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 21 Jul 2022 17:09:15 +0200
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <Ytli3Fe8b6UMae5A@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
 <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
 <Ytli3Fe8b6UMae5A@redhat.com>
Message-ID: <239a43bd-fafb-5fc6-ff00-59ff4ec6a086@redhat.com>

On 7/21/22 16:29, Daniel P. Berrang? wrote:
> On Thu, Jul 21, 2022 at 04:10:11PM +0200, Michal Pr?vozn?k wrote:
>> On 7/21/22 15:24, Daniel P. Berrang? wrote:
>>> On Thu, Jul 21, 2022 at 03:12:05PM +0200, Michal Pr?vozn?k wrote:
>>>> On 7/21/22 10:06, Daniel P. Berrang? wrote:
>>>> Agreed. While libvirt can allow /dev/sgx* in CGroups (we do that for
>>>> other devices, including NVDIMM and virtio-pmem types of <memory/>),
>>>> it's more tricky with relabelling.
>>>>
>>>> By default, when available, libvirt creates a separate mount namespace
>>>> for each QEMU process and creates a very small /dev there, with only
>>>> those nodes that QEMU needs. Now, if libvirt is fixed (I have follow up
>>>> patches on top of this series) the /dev/sgx* nodes are created there AND
>>>> I have another patch that sets DAC/SELinux label on them so that uid=0
>>>> is no longer needed. What I worry about though, is the case when this
>>>> namespace feature is disabled. Then libvirt should not touch /dev/sgx*
>>>> because that might compromise security in the system.
>>>
>>> That might in turn require the ability to pass in pre-opened FDs for
>>> the devices to QEMU.
>>
>> Yeah, that might be the perfect solution, but IIUC there's currently no
>> way to achieve that, or is it? Is it something we should do in QEMU first?
> 
> The code uses 'qemu_open', so it should be possible already with
> FD passing, by using a /dev/fdset/NNN path.

But there's no attribute that libvirt provides a path to. How does FD
passing work in such case then?

Here's the SGX part of cmd line:

-object
'{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"prealloc-threads":16,"size":16777216,"host-nodes":[0],"policy":"bind"}'
\

Michal


From mkletzan at redhat.com  Thu Jul 21 15:11:39 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 17:11:39 +0200
Subject: [PATCH v2 6/8] domain_conf: use early return in
 virDomainObjAssignDef()
In-Reply-To: <f3102b0e58d093922c24e666d22ee9148dc90014.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <f3102b0e58d093922c24e666d22ee9148dc90014.1658400080.git.khanicov@redhat.com>
Message-ID: <Ytlsq+Y6MAeNQIiT@wheatley>

On Thu, Jul 21, 2022 at 12:45:51PM +0200, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/75a0b714/attachment.sig>

From berrange at redhat.com  Thu Jul 21 15:11:59 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 21 Jul 2022 16:11:59 +0100
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <239a43bd-fafb-5fc6-ff00-59ff4ec6a086@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
 <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
 <Ytli3Fe8b6UMae5A@redhat.com>
 <239a43bd-fafb-5fc6-ff00-59ff4ec6a086@redhat.com>
Message-ID: <Ytlsv5hMNghWyPu2@redhat.com>

On Thu, Jul 21, 2022 at 05:09:15PM +0200, Michal Pr?vozn?k wrote:
> On 7/21/22 16:29, Daniel P. Berrang? wrote:
> > On Thu, Jul 21, 2022 at 04:10:11PM +0200, Michal Pr?vozn?k wrote:
> >> On 7/21/22 15:24, Daniel P. Berrang? wrote:
> >>> On Thu, Jul 21, 2022 at 03:12:05PM +0200, Michal Pr?vozn?k wrote:
> >>>> On 7/21/22 10:06, Daniel P. Berrang? wrote:
> >>>> Agreed. While libvirt can allow /dev/sgx* in CGroups (we do that for
> >>>> other devices, including NVDIMM and virtio-pmem types of <memory/>),
> >>>> it's more tricky with relabelling.
> >>>>
> >>>> By default, when available, libvirt creates a separate mount namespace
> >>>> for each QEMU process and creates a very small /dev there, with only
> >>>> those nodes that QEMU needs. Now, if libvirt is fixed (I have follow up
> >>>> patches on top of this series) the /dev/sgx* nodes are created there AND
> >>>> I have another patch that sets DAC/SELinux label on them so that uid=0
> >>>> is no longer needed. What I worry about though, is the case when this
> >>>> namespace feature is disabled. Then libvirt should not touch /dev/sgx*
> >>>> because that might compromise security in the system.
> >>>
> >>> That might in turn require the ability to pass in pre-opened FDs for
> >>> the devices to QEMU.
> >>
> >> Yeah, that might be the perfect solution, but IIUC there's currently no
> >> way to achieve that, or is it? Is it something we should do in QEMU first?
> > 
> > The code uses 'qemu_open', so it should be possible already with
> > FD passing, by using a /dev/fdset/NNN path.
> 
> But there's no attribute that libvirt provides a path to. How does FD
> passing work in such case then?

Oh right, I forgot, so this can't be used as is.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mkletzan at redhat.com  Thu Jul 21 15:13:42 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 17:13:42 +0200
Subject: [PATCH v2 7/8] domain_conf: rewrite conditions in
 virDomainObjWaitUntil()
In-Reply-To: <e91bd54748d1ce08916308014fb647f88da612d4.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <e91bd54748d1ce08916308014fb647f88da612d4.1658400080.git.khanicov@redhat.com>
Message-ID: <YtltJhxtSVj219Dl@wheatley>

On Thu, Jul 21, 2022 at 12:45:52PM +0200, Kristina Hanicova wrote:
>This patch rewrites conditions to make the code easier and less
>structured.
>

"less structured" bears a negative connotation, but I must say the code
is very easy now =D ;)

s/easier/easier to read/; s/structured/nested/

>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/76f9010b/attachment.sig>

From mkletzan at redhat.com  Thu Jul 21 15:14:11 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 17:14:11 +0200
Subject: [PATCH v2 8/8] domain_conf: rewrite variable setting
In-Reply-To: <97a887d2cfd18d325b55d5f364664da1f2189f2f.1658400080.git.khanicov@redhat.com>
References: <cover.1658400080.git.khanicov@redhat.com>
 <97a887d2cfd18d325b55d5f364664da1f2189f2f.1658400080.git.khanicov@redhat.com>
Message-ID: <YtltQw1tYk0NBlQm@wheatley>

On Thu, Jul 21, 2022 at 12:45:53PM +0200, Kristina Hanicova wrote:
>Signed-off-by: Kristina Hanicova <khanicov at redhat.com>

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>

>---
> src/conf/domain_conf.c | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
>diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
>index bbe6574487..d3872830c9 100644
>--- a/src/conf/domain_conf.c
>+++ b/src/conf/domain_conf.c
>@@ -4216,12 +4216,8 @@ virDomainObjGetOneDefState(virDomainObj *vm,
>     if (virDomainObjUpdateModificationImpact(vm, &flags) < 0)
>         return NULL;
>
>-    if (live) {
>-        if (flags & VIR_DOMAIN_AFFECT_LIVE)
>-            *live = true;
>-        else
>-            *live = false;
>-    }
>+    if (live)
>+        *live = flags & VIR_DOMAIN_AFFECT_LIVE;
>
>     if (virDomainObjIsActive(vm) && flags & VIR_DOMAIN_AFFECT_CONFIG)
>         return vm->newDef;
>-- 
>2.35.3
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/4ba33d86/attachment-0001.sig>

From mkletzan at redhat.com  Thu Jul 21 15:30:59 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Thu, 21 Jul 2022 17:30:59 +0200
Subject: [PATCH 0/4] jobs: make & use generalized virDomainObjInitJob()
In-Reply-To: <cover.1658404272.git.khanicov@redhat.com>
References: <cover.1658404272.git.khanicov@redhat.com>
Message-ID: <YtlxMw4EDW2WZTzJ@wheatley>

On Thu, Jul 21, 2022 at 01:54:45PM +0200, Kristina Hanicova wrote:
>This series uses qemuDomainObjInitJob() as virDomainObjInitJob() in all

I would prefer to rather use a name "virDomainJobObjInit" since it
initialises the job obj.  It is not a domain object that initialises a
job.

With that changed (and obvious relevant fixed applied)

Reviewed-by: Martin Kletzander <mkletzan at redhat.com>

>drivers that use virDomainObjJob structure.
>
>Kristina Hanicova (4):
>  qemu & hypervisor: move qemuDomainObjInitJob() into hypervisor
>  libxl: use virDomainObjInitJob()
>  LXC: use virDomainObjInitJob()
>  CH: use virDomainObjInitJob()
>
> src/ch/ch_domain.c          | 13 +------------
> src/hypervisor/domain_job.c | 25 +++++++++++++++++++++++++
> src/hypervisor/domain_job.h |  4 ++++
> src/libvirt_private.syms    |  1 +
> src/libxl/libxl_domain.c    | 17 +++--------------
> src/lxc/lxc_domain.c        | 13 +------------
> src/qemu/qemu_domain.c      |  2 +-
> src/qemu/qemu_domainjob.c   | 26 --------------------------
> src/qemu/qemu_domainjob.h   |  4 ----
> 9 files changed, 36 insertions(+), 69 deletions(-)
>
>-- 
>2.35.3
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220721/f4f6a323/attachment.sig>

From lin.a.yang at intel.com  Fri Jul 22 06:57:11 2022
From: lin.a.yang at intel.com (Yang, Lin A)
Date: Fri, 22 Jul 2022 06:57:11 +0000
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
 <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
Message-ID: <MN0PR11MB5987116AC4AA1554C411B542D4909@MN0PR11MB5987.namprd11.prod.outlook.com>

> BTW: I can see in QEMU sources /dev/sgx_vepc and /dev/sgx_provision being
> opened, but not sgx_enclave. And I see the former two on my system but not
> the last one. Can you Yang, share more info on this please?

True, QEMU only need read and write access to /dev/sgx_vepc and /dev/sgx_provision. 

/dev/sgx_vepc allows userspace to allocate "raw" EPC without an associated enclave.
The only known use case for raw EPC allocation is to expose EPC to a KVM guest, 
hence call it 'vepc'.

/dev/sgx_enclave allows creating host enclave. It is not suitable for allocating EPC for
KVM guest. Having separate device nodes, /dev/sgx_vepc and /dev/sgx_enclave,
allows separate permission control for creating host SGX enclaves and KVM SGX guests.

/dev/sgx_provision allows creating provisioning enclaves, which typically have more 
strict permissions than the plain enclave device /dev/sgx_enclave.

Usually /dev/sgx_enclave and /dev/sgx_provision should exist together on your system. 
Set "CONFIG_X86_SGX=y" in Kconfig and enable SGX in bios should enable SGX driver
and create /dev/sgx_enclave and /dev/sgx_provision device nodes.
"CONFIG_X86_SGX_KVM=y" will create /dev/sgx_vepc device node.

Regrading to permission control, one suggested way is making /dev/sgx_enclave is
accessible to all userspace applications to create its enclave. Having strict permissions
on /dev/sgx_vepc and /dev/sgx_provision only for user in specific group "XYZ".

# ls -l /dev/sgx*
crw-rw-rw- 1 root root 10, 125 Nov 16  2021 /dev/sgx_enclave
crw-rw---- 1 root XYZ  10, 126 Nov 16  2021 /dev/sgx_provision
crw-rw---- 1 root XYZ  10, 124 Nov 16  2021 /dev/sgx_vepc

Instead of running QEMU by root, one straightforward way is admin create a
dedicated "qemu" user and add it to "XYZ" group. In /etc/libvirt/qemu.conf,

user = "qemu"

Any concerns about this solution?

Thanks,
Lin.

From mprivozn at redhat.com  Fri Jul 22 08:13:08 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 22 Jul 2022 10:13:08 +0200
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <MN0PR11MB5987116AC4AA1554C411B542D4909@MN0PR11MB5987.namprd11.prod.outlook.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
 <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
 <MN0PR11MB5987116AC4AA1554C411B542D4909@MN0PR11MB5987.namprd11.prod.outlook.com>
Message-ID: <9d4078cd-7db9-ab56-f523-3b2e884e9613@redhat.com>

On 7/22/22 08:57, Yang, Lin A wrote:
>> BTW: I can see in QEMU sources /dev/sgx_vepc and /dev/sgx_provision being
>> opened, but not sgx_enclave. And I see the former two on my system but not
>> the last one. Can you Yang, share more info on this please?
> 
> True, QEMU only need read and write access to /dev/sgx_vepc and /dev/sgx_provision. 
> 
> /dev/sgx_vepc allows userspace to allocate "raw" EPC without an associated enclave.
> The only known use case for raw EPC allocation is to expose EPC to a KVM guest, 
> hence call it 'vepc'.
> 
> /dev/sgx_enclave allows creating host enclave. It is not suitable for allocating EPC for
> KVM guest. Having separate device nodes, /dev/sgx_vepc and /dev/sgx_enclave,
> allows separate permission control for creating host SGX enclaves and KVM SGX guests.

I see where the problem is now. My processor lacks X86_FEATURE_SGX_LC
therefore, when SGX driver wants to register /dev/sgx_enclave inside of
sgx_drv_init() (arch/x86/kernel/cpu/sgx/driver.c) the function exits early.

> 
> /dev/sgx_provision allows creating provisioning enclaves, which typically have more 
> strict permissions than the plain enclave device /dev/sgx_enclave.
> 
> Usually /dev/sgx_enclave and /dev/sgx_provision should exist together on your system. 
> Set "CONFIG_X86_SGX=y" in Kconfig and enable SGX in bios should enable SGX driver
> and create /dev/sgx_enclave and /dev/sgx_provision device nodes.
> "CONFIG_X86_SGX_KVM=y" will create /dev/sgx_vepc device node.
> 
> Regrading to permission control, one suggested way is making /dev/sgx_enclave is
> accessible to all userspace applications to create its enclave. Having strict permissions
> on /dev/sgx_vepc and /dev/sgx_provision only for user in specific group "XYZ".
> 
> # ls -l /dev/sgx*
> crw-rw-rw- 1 root root 10, 125 Nov 16  2021 /dev/sgx_enclave
> crw-rw---- 1 root XYZ  10, 126 Nov 16  2021 /dev/sgx_provision
> crw-rw---- 1 root XYZ  10, 124 Nov 16  2021 /dev/sgx_vepc
> 
> Instead of running QEMU by root, one straightforward way is admin create a
> dedicated "qemu" user and add it to "XYZ" group. In /etc/libvirt/qemu.conf,
> 
> user = "qemu"
> 
> Any concerns about this solution?

Well, as discussed with Daniel earlier, libvirt creates a separate mount
namespace for each QEMU and inside it creates a very thin /dev with only
a handful of nodes (per guest config). And what my patch does (and what
we already do for /dev/sev) is mknod() /dev/sgx_provision and
/dev/sgx_vepc inside that thin /dev and chown() it to the user under
which QEMU is about to run.

This namespace feature can be turned off though, in which case libvirt
won't chown() those files (well, my patch is written that way). I think
this is acceptable trade off between security and usability. Namespaces
are enabled by default (if kernel supports them).

Alright, so here's what we'll do. I'll polish my patches, fix up yours
and send for review. Does this work for you?

Michal


From fjin at redhat.com  Fri Jul 22 08:49:40 2022
From: fjin at redhat.com (Fangge Jin)
Date: Fri, 22 Jul 2022 16:49:40 +0800
Subject: [PATCH] news: qemu: Add support for zero-copy migration
Message-ID: <20220722084940.54406-1-fjin@redhat.com>

Signed-off-by: Fangge Jin <fjin at redhat.com>
---
 NEWS.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/NEWS.rst b/NEWS.rst
index 79aad652e8..0eb3299e3b 100644
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -42,6 +42,11 @@ v8.5.0 (2022-07-01)
     A new ``VIR_MIGRATE_POSTCOPY_RESUME`` flag (``virsh migrate --postcopy-resume``)
     was introduced for recovering from a failed post-copy migration.
 
+  * qemu: Add support for zero-copy migration
+
+    With QEMU 7.1.0, libvirt can enable zerocopy for parallel migration. This is 
+    implmented by adding a new ``VIR_MIGRATE_ZEROCOPY`` flag(``virsh migrate --zerocopy``).
+
   * Introduce thread_pool_min and thread_pool_max attributes to IOThread
 
     New attributes ``thread_pool_min`` and ``thread_pool_max`` were introduced
-- 
2.31.1


From mkletzan at redhat.com  Fri Jul 22 10:22:54 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Fri, 22 Jul 2022 12:22:54 +0200
Subject: [PATCH] qemu_migration: Acquire correct job in
 qemuMigrationSrcIsAllowed
Message-ID: <9e34ee4dc0daa5367efccfa2bd2e17094358fa33.1658485317.git.mkletzan@redhat.com>

Commit 62627524607f added the acquiring of a job, but it is not always
VIR_ASYNC_JOB_MIGRATION_OUT, so the code fails when doing save or anything else.
Correct the async job by passing it from the caller as another parameter.

Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
---
This will hopefully fix the integration tests that failed this morning:

https://gitlab.com/libvirt/libvirt/-/pipelines/594066714

 src/qemu/qemu_driver.c    | 8 ++++----
 src/qemu/qemu_migration.c | 7 ++++---
 src/qemu/qemu_migration.h | 1 +
 src/qemu/qemu_snapshot.c  | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 75c7a8a6b225..9013e6fb8d9a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2651,13 +2651,13 @@ qemuDomainSaveInternal(virQEMUDriver *driver,
     virQEMUSaveData *data = NULL;
     g_autoptr(qemuDomainSaveCookie) cookie = NULL;
 
-    if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0))
-        goto cleanup;
-
     if (qemuDomainObjBeginAsyncJob(driver, vm, VIR_ASYNC_JOB_SAVE,
                                    VIR_DOMAIN_JOB_OPERATION_SAVE, flags) < 0)
         goto cleanup;
 
+    if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SAVE, 0))
+        goto cleanup;
+
     if (!virDomainObjIsActive(vm)) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("guest unexpectedly quit"));
@@ -3177,7 +3177,7 @@ doCoreDump(virQEMUDriver *driver,
             goto cleanup;
         }
 
-        if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0))
+        if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_DUMP, 0))
             goto cleanup;
 
         if (qemuMigrationSrcToFile(driver, vm, fd, compressor,
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 84befe7d39e7..20dc91f1cedd 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1452,6 +1452,7 @@ bool
 qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
                           virDomainObj *vm,
                           bool remote,
+                          int asyncJob,
                           unsigned int flags)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
@@ -1483,7 +1484,7 @@ qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
             g_auto(GStrv) blockers = NULL;
 
             if (qemuDomainGetMigrationBlockers(driver, vm,
-                                               VIR_ASYNC_JOB_MIGRATION_OUT,
+                                               asyncJob,
                                                &blockers) < 0) {
                 return false;
             }
@@ -2637,7 +2638,7 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
         qemuMigrationJobStartPhase(vm, QEMU_MIGRATION_PHASE_BEGIN3) < 0)
         return NULL;
 
-    if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags))
+    if (!qemuMigrationSrcIsAllowed(driver, vm, true, priv->job.asyncJob, flags))
         return NULL;
 
     if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) &&
@@ -6039,7 +6040,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver,
         if (!(flags & VIR_MIGRATE_OFFLINE) && virDomainObjCheckActive(vm) < 0)
             goto endjob;
 
-        if (!qemuMigrationSrcIsAllowed(driver, vm, true, flags))
+        if (!qemuMigrationSrcIsAllowed(driver, vm, true, VIR_ASYNC_JOB_MIGRATION_OUT, flags))
             goto endjob;
 
         if (!(flags & (VIR_MIGRATE_UNSAFE | VIR_MIGRATE_OFFLINE)) &&
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 65c29d574405..a39f65165988 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -229,6 +229,7 @@ bool
 qemuMigrationSrcIsAllowed(virQEMUDriver *driver,
                           virDomainObj *vm,
                           bool remote,
+                          int asyncJob,
                           unsigned int flags);
 
 int
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 833f880252af..0733d44faac4 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -291,7 +291,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver,
     virDomainSnapshotDef *snapdef = virDomainSnapshotObjGetDef(snap);
     int ret = -1;
 
-    if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0))
+    if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SNAPSHOT, 0))
         goto cleanup;
 
     if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_RUNNING) {
@@ -1422,7 +1422,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
     /* do the memory snapshot if necessary */
     if (memory) {
         /* check if migration is possible */
-        if (!qemuMigrationSrcIsAllowed(driver, vm, false, 0))
+        if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SNAPSHOT, 0))
             goto cleanup;
 
         qemuDomainJobSetStatsType(priv->job.current,
-- 
2.35.1


From jdenemar at redhat.com  Fri Jul 22 10:34:19 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 22 Jul 2022 12:34:19 +0200
Subject: [PATCH] qemu_migration: Acquire correct job in
 qemuMigrationSrcIsAllowed
In-Reply-To: <9e34ee4dc0daa5367efccfa2bd2e17094358fa33.1658485317.git.mkletzan@redhat.com>
References: <9e34ee4dc0daa5367efccfa2bd2e17094358fa33.1658485317.git.mkletzan@redhat.com>
Message-ID: <Ytp9K5fL2u/Gqh1d@orkuz.int.mamuti.net>

On Fri, Jul 22, 2022 at 12:22:54 +0200, Martin Kletzander wrote:
> Commit 62627524607f added the acquiring of a job, but it is not always
> VIR_ASYNC_JOB_MIGRATION_OUT, so the code fails when doing save or anything else.
> Correct the async job by passing it from the caller as another parameter.
> 
> Signed-off-by: Martin Kletzander <mkletzan at redhat.com>
> ---
> This will hopefully fix the integration tests that failed this morning:
> 
> https://gitlab.com/libvirt/libvirt/-/pipelines/594066714
> 
>  src/qemu/qemu_driver.c    | 8 ++++----
>  src/qemu/qemu_migration.c | 7 ++++---
>  src/qemu/qemu_migration.h | 1 +
>  src/qemu/qemu_snapshot.c  | 4 ++--
>  4 files changed, 11 insertions(+), 9 deletions(-)

Oops.

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

From pkrempa at redhat.com  Fri Jul 22 10:55:57 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 22 Jul 2022 12:55:57 +0200
Subject: [PATCH 0/3] ci: Drop Alpine-314 and Debian-10
Message-ID: <cover.1658486845.git.pkrempa@redhat.com>

Alpine-314 was dropped by lcitool recently.

Debian-10 will reach EOL in August, so patches 2-3/3 should
be pushed only after the upcoming release.

Pipeline: https://gitlab.com/pipo.sk/libvirt/-/pipelines/594315458

Peter Krempa (3):
  ci: Move builds from alpine-314 to alpine-315
  ci: Move active Debian-10 jobs to Debian-11
  ci: Drop Debian 10

 ci/containers/alpine-314.Dockerfile           |  81 -----------
 .../debian-10-cross-aarch64.Dockerfile        | 125 -----------------
 .../debian-10-cross-armv6l.Dockerfile         | 124 -----------------
 .../debian-10-cross-armv7l.Dockerfile         | 125 -----------------
 ci/containers/debian-10-cross-i686.Dockerfile | 124 -----------------
 ci/containers/debian-10-cross-mips.Dockerfile | 124 -----------------
 .../debian-10-cross-mips64el.Dockerfile       | 124 -----------------
 .../debian-10-cross-mipsel.Dockerfile         | 124 -----------------
 .../debian-10-cross-ppc64le.Dockerfile        | 124 -----------------
 .../debian-10-cross-s390x.Dockerfile          | 124 -----------------
 ci/containers/debian-10.Dockerfile            | 105 --------------
 ci/gitlab.yml                                 |   2 +-
 ci/gitlab/builds.yml                          | 130 ------------------
 ci/gitlab/containers.yml                      |  87 ------------
 ci/manifest.yml                               |  44 ------
 15 files changed, 1 insertion(+), 1566 deletions(-)
 delete mode 100644 ci/containers/alpine-314.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
 delete mode 100644 ci/containers/debian-10.Dockerfile

-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 22 10:55:58 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 22 Jul 2022 12:55:58 +0200
Subject: [PATCH 1/3] ci: Move builds from alpine-314 to alpine-315
In-Reply-To: <cover.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
Message-ID: <d8b143120bbb1325c6e25fbe5d8e2084394de5d0.1658486845.git.pkrempa@redhat.com>

'lcitool' dropped alpine-314

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ci/containers/alpine-314.Dockerfile | 81 -----------------------------
 ci/gitlab.yml                       |  2 +-
 ci/gitlab/builds.yml                | 11 ----
 ci/gitlab/containers.yml            |  8 ---
 ci/manifest.yml                     |  3 --
 5 files changed, 1 insertion(+), 104 deletions(-)
 delete mode 100644 ci/containers/alpine-314.Dockerfile

diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile
deleted file mode 100644
index 1cd3fc6b0c..0000000000
--- a/ci/containers/alpine-314.Dockerfile
+++ /dev/null
@@ -1,81 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/alpine:3.14
-
-RUN apk update && \
-    apk upgrade && \
-    apk add \
-        acl-dev \
-        attr-dev \
-        audit-dev \
-        augeas \
-        bash-completion \
-        ca-certificates \
-        ccache \
-        ceph-dev \
-        clang \
-        curl-dev \
-        cyrus-sasl-dev \
-        diffutils \
-        eudev-dev \
-        fuse-dev \
-        gcc \
-        gettext \
-        git \
-        glib-dev \
-        gnutls-dev \
-        grep \
-        iproute2 \
-        iptables \
-        kmod \
-        libcap-ng-dev \
-        libnl3-dev \
-        libpcap-dev \
-        libpciaccess-dev \
-        libselinux-dev \
-        libssh-dev \
-        libssh2-dev \
-        libtirpc-dev \
-        libxml2-dev \
-        libxml2-utils \
-        libxslt \
-        lvm2 \
-        lvm2-dev \
-        make \
-        meson \
-        musl-dev \
-        netcf-dev \
-        nfs-utils \
-        numactl-dev \
-        open-iscsi \
-        parted-dev \
-        perl \
-        pkgconf \
-        polkit \
-        py3-docutils \
-        py3-flake8 \
-        python3 \
-        qemu-img \
-        readline-dev \
-        rpcgen \
-        samurai \
-        sed \
-        util-linux-dev \
-        wireshark-dev \
-        xen-dev \
-        yajl-dev && \
-    apk list | sort > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/gitlab.yml b/ci/gitlab.yml
index ea0f847789..ff7c0ba16c 100644
--- a/ci/gitlab.yml
+++ b/ci/gitlab.yml
@@ -19,7 +19,7 @@
 #
 #  $ git config --local alias.push-all-ctr "push -o ci.variable=RUN_ALL_CONTAINERS=1"
 #
-# Allowing the less verbose invokation
+# Allowing the less verbose invocation
 #
 #  $ git push-all-ctr
 #
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 443c1ac299..e3ed4a0753 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -31,16 +31,6 @@ x86_64-almalinux-8-clang:
     RPM: skip


-x86_64-alpine-314:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-alpine-314-container
-      optional: true
-  allow_failure: false
-  variables:
-    NAME: alpine-314
-
-
 x86_64-alpine-315:
   extends: .native_build_job
   needs:
@@ -48,7 +38,6 @@ x86_64-alpine-315:
       optional: true
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: alpine-315


diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index 3835a19216..fe96be32f5 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -14,18 +14,10 @@ x86_64-almalinux-8-container:
     NAME: almalinux-8


-x86_64-alpine-314-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    NAME: alpine-314
-
-
 x86_64-alpine-315-container:
   extends: .container_job
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: alpine-315


diff --git a/ci/manifest.yml b/ci/manifest.yml
index 6b8f2bc526..316181b188 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -19,12 +19,9 @@ targets:
           RPM: skip
           CC: clang

-  alpine-314: x86_64
-
   alpine-315:
     jobs:
       - arch: x86_64
-        builds: false

   alpine-edge:
     jobs:
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 22 10:55:59 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 22 Jul 2022 12:55:59 +0200
Subject: [PATCH 2/3] ci: Move active Debian-10 jobs to Debian-11
In-Reply-To: <cover.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
Message-ID: <9d816f6901027a429572867b8274f6d04358a941.1658486845.git.pkrempa@redhat.com>

Debian 10 will reach EOL in august of 2022 and thus libvirt will no
longer target it. Move CI jobs over to Debian-11.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 ci/gitlab/builds.yml     | 4 ++--
 ci/gitlab/containers.yml | 3 ++-
 ci/manifest.yml          | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index e3ed4a0753..953c1b078f 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -86,6 +86,7 @@ x86_64-debian-10:
       optional: true
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -96,7 +97,6 @@ x86_64-debian-11:
       optional: true
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: debian-11


@@ -264,6 +264,7 @@ armv7l-debian-10:
   allow_failure: false
   variables:
     CROSS: armv7l
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -371,7 +372,6 @@ armv7l-debian-11:
   allow_failure: false
   variables:
     CROSS: armv7l
-    JOB_OPTIONAL: 1
     NAME: debian-11


diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index fe96be32f5..b77baf509e 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -46,6 +46,7 @@ x86_64-debian-10-container:
   extends: .container_job
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10


@@ -135,6 +136,7 @@ armv7l-debian-10-container:
   extends: .container_job
   allow_failure: false
   variables:
+    JOB_OPTIONAL: 1
     NAME: debian-10-cross-armv7l


@@ -206,7 +208,6 @@ armv7l-debian-11-container:
   extends: .container_job
   allow_failure: false
   variables:
-    JOB_OPTIONAL: 1
     NAME: debian-11-cross-armv7l


diff --git a/ci/manifest.yml b/ci/manifest.yml
index 316181b188..01dc5e4c9a 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -47,6 +47,7 @@ targets:
   debian-10:
     jobs:
       - arch: x86_64
+        builds: false

       - arch: aarch64
         allow-failure: true
@@ -57,6 +58,7 @@ targets:
         builds: false

       - arch: armv7l
+        builds: false

       - arch: i686
         allow-failure: true
@@ -85,7 +87,6 @@ targets:
   debian-11:
     jobs:
       - arch: x86_64
-        builds: false

       - arch: x86_64
         suffix: -clang
@@ -99,8 +100,6 @@ targets:
         builds: false

       - arch: armv7l
-        containers: false
-        builds: false

       - arch: i686
         containers: false
-- 
2.36.1


From pkrempa at redhat.com  Fri Jul 22 10:56:00 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 22 Jul 2022 12:56:00 +0200
Subject: [PATCH 3/3] ci: Drop Debian 10
In-Reply-To: <cover.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
Message-ID: <1ebe84e14e48e44ae35b467b498d693960e388ee.1658486845.git.pkrempa@redhat.com>

Debian 10 reaches EOL in August of 2022.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../debian-10-cross-aarch64.Dockerfile        | 125 ------------------
 .../debian-10-cross-armv6l.Dockerfile         | 124 -----------------
 .../debian-10-cross-armv7l.Dockerfile         | 125 ------------------
 ci/containers/debian-10-cross-i686.Dockerfile | 124 -----------------
 ci/containers/debian-10-cross-mips.Dockerfile | 124 -----------------
 .../debian-10-cross-mips64el.Dockerfile       | 124 -----------------
 .../debian-10-cross-mipsel.Dockerfile         | 124 -----------------
 .../debian-10-cross-ppc64le.Dockerfile        | 124 -----------------
 .../debian-10-cross-s390x.Dockerfile          | 124 -----------------
 ci/containers/debian-10.Dockerfile            | 105 ---------------
 ci/gitlab/builds.yml                          | 119 -----------------
 ci/gitlab/containers.yml                      |  80 -----------
 ci/manifest.yml                               |  40 ------
 13 files changed, 1462 deletions(-)
 delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
 delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
 delete mode 100644 ci/containers/debian-10.Dockerfile

diff --git a/ci/containers/debian-10-cross-aarch64.Dockerfile b/ci/containers/debian-10-cross-aarch64.Dockerfile
deleted file mode 100644
index f4054490df..0000000000
--- a/ci/containers/debian-10-cross-aarch64.Dockerfile
+++ /dev/null
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture arm64 && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-aarch64-linux-gnu \
-            libacl1-dev:arm64 \
-            libapparmor-dev:arm64 \
-            libattr1-dev:arm64 \
-            libaudit-dev:arm64 \
-            libblkid-dev:arm64 \
-            libc6-dev:arm64 \
-            libcap-ng-dev:arm64 \
-            libcurl4-gnutls-dev:arm64 \
-            libdevmapper-dev:arm64 \
-            libfuse-dev:arm64 \
-            libglib2.0-dev:arm64 \
-            libglusterfs-dev:arm64 \
-            libgnutls28-dev:arm64 \
-            libiscsi-dev:arm64 \
-            libnl-3-dev:arm64 \
-            libnl-route-3-dev:arm64 \
-            libnuma-dev:arm64 \
-            libparted-dev:arm64 \
-            libpcap0.8-dev:arm64 \
-            libpciaccess-dev:arm64 \
-            librbd-dev:arm64 \
-            libreadline-dev:arm64 \
-            libsanlock-dev:arm64 \
-            libsasl2-dev:arm64 \
-            libselinux1-dev:arm64 \
-            libssh-gcrypt-dev:arm64 \
-            libssh2-1-dev:arm64 \
-            libtirpc-dev:arm64 \
-            libudev-dev:arm64 \
-            libxen-dev:arm64 \
-            libxml2-dev:arm64 \
-            libyajl-dev:arm64 \
-            systemtap-sdt-dev:arm64 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/aarch64-linux-gnu-gcc'\n\
-ar = '/usr/bin/aarch64-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/aarch64-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/aarch64-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'aarch64'\n\
-cpu = 'aarch64'\n\
-endian = 'little'" > /usr/local/share/meson/cross/aarch64-linux-gnu && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-gcc
-
-ENV ABI "aarch64-linux-gnu"
-ENV MESON_OPTS "--cross-file=aarch64-linux-gnu"
diff --git a/ci/containers/debian-10-cross-armv6l.Dockerfile b/ci/containers/debian-10-cross-armv6l.Dockerfile
deleted file mode 100644
index 96a6fa94aa..0000000000
--- a/ci/containers/debian-10-cross-armv6l.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armel && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabi \
-            libacl1-dev:armel \
-            libapparmor-dev:armel \
-            libattr1-dev:armel \
-            libaudit-dev:armel \
-            libblkid-dev:armel \
-            libc6-dev:armel \
-            libcap-ng-dev:armel \
-            libcurl4-gnutls-dev:armel \
-            libdevmapper-dev:armel \
-            libfuse-dev:armel \
-            libglib2.0-dev:armel \
-            libglusterfs-dev:armel \
-            libgnutls28-dev:armel \
-            libiscsi-dev:armel \
-            libnl-3-dev:armel \
-            libnl-route-3-dev:armel \
-            libnuma-dev:armel \
-            libparted-dev:armel \
-            libpcap0.8-dev:armel \
-            libpciaccess-dev:armel \
-            librbd-dev:armel \
-            libreadline-dev:armel \
-            libsanlock-dev:armel \
-            libsasl2-dev:armel \
-            libselinux1-dev:armel \
-            libssh-gcrypt-dev:armel \
-            libssh2-1-dev:armel \
-            libtirpc-dev:armel \
-            libudev-dev:armel \
-            libxml2-dev:armel \
-            libyajl-dev:armel \
-            systemtap-sdt-dev:armel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabi-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabi-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabi-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabi-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'arm'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabi && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-gcc
-
-ENV ABI "arm-linux-gnueabi"
-ENV MESON_OPTS "--cross-file=arm-linux-gnueabi"
diff --git a/ci/containers/debian-10-cross-armv7l.Dockerfile b/ci/containers/debian-10-cross-armv7l.Dockerfile
deleted file mode 100644
index d3c221e87a..0000000000
--- a/ci/containers/debian-10-cross-armv7l.Dockerfile
+++ /dev/null
@@ -1,125 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture armhf && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-arm-linux-gnueabihf \
-            libacl1-dev:armhf \
-            libapparmor-dev:armhf \
-            libattr1-dev:armhf \
-            libaudit-dev:armhf \
-            libblkid-dev:armhf \
-            libc6-dev:armhf \
-            libcap-ng-dev:armhf \
-            libcurl4-gnutls-dev:armhf \
-            libdevmapper-dev:armhf \
-            libfuse-dev:armhf \
-            libglib2.0-dev:armhf \
-            libglusterfs-dev:armhf \
-            libgnutls28-dev:armhf \
-            libiscsi-dev:armhf \
-            libnl-3-dev:armhf \
-            libnl-route-3-dev:armhf \
-            libnuma-dev:armhf \
-            libparted-dev:armhf \
-            libpcap0.8-dev:armhf \
-            libpciaccess-dev:armhf \
-            librbd-dev:armhf \
-            libreadline-dev:armhf \
-            libsanlock-dev:armhf \
-            libsasl2-dev:armhf \
-            libselinux1-dev:armhf \
-            libssh-gcrypt-dev:armhf \
-            libssh2-1-dev:armhf \
-            libtirpc-dev:armhf \
-            libudev-dev:armhf \
-            libxen-dev:armhf \
-            libxml2-dev:armhf \
-            libyajl-dev:armhf \
-            systemtap-sdt-dev:armhf && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/arm-linux-gnueabihf-gcc'\n\
-ar = '/usr/bin/arm-linux-gnueabihf-gcc-ar'\n\
-strip = '/usr/bin/arm-linux-gnueabihf-strip'\n\
-pkgconfig = '/usr/bin/arm-linux-gnueabihf-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'arm'\n\
-cpu = 'armhf'\n\
-endian = 'little'" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf-gcc
-
-ENV ABI "arm-linux-gnueabihf"
-ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf"
diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile
deleted file mode 100644
index 37f4962286..0000000000
--- a/ci/containers/debian-10-cross-i686.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture i386 && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-i686-linux-gnu \
-            libacl1-dev:i386 \
-            libapparmor-dev:i386 \
-            libattr1-dev:i386 \
-            libaudit-dev:i386 \
-            libblkid-dev:i386 \
-            libc6-dev:i386 \
-            libcap-ng-dev:i386 \
-            libcurl4-gnutls-dev:i386 \
-            libdevmapper-dev:i386 \
-            libfuse-dev:i386 \
-            libglib2.0-dev:i386 \
-            libglusterfs-dev:i386 \
-            libgnutls28-dev:i386 \
-            libiscsi-dev:i386 \
-            libnl-3-dev:i386 \
-            libnl-route-3-dev:i386 \
-            libnuma-dev:i386 \
-            libparted-dev:i386 \
-            libpcap0.8-dev:i386 \
-            libpciaccess-dev:i386 \
-            librbd-dev:i386 \
-            libreadline-dev:i386 \
-            libsanlock-dev:i386 \
-            libsasl2-dev:i386 \
-            libselinux1-dev:i386 \
-            libssh-gcrypt-dev:i386 \
-            libssh2-1-dev:i386 \
-            libtirpc-dev:i386 \
-            libudev-dev:i386 \
-            libxml2-dev:i386 \
-            libyajl-dev:i386 \
-            systemtap-sdt-dev:i386 && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/i686-linux-gnu-gcc'\n\
-ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/i686-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'x86'\n\
-cpu = 'i686'\n\
-endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc
-
-ENV ABI "i686-linux-gnu"
-ENV MESON_OPTS "--cross-file=i686-linux-gnu"
diff --git a/ci/containers/debian-10-cross-mips.Dockerfile b/ci/containers/debian-10-cross-mips.Dockerfile
deleted file mode 100644
index 7c8847260f..0000000000
--- a/ci/containers/debian-10-cross-mips.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-mips-linux-gnu \
-            libacl1-dev:mips \
-            libapparmor-dev:mips \
-            libattr1-dev:mips \
-            libaudit-dev:mips \
-            libblkid-dev:mips \
-            libc6-dev:mips \
-            libcap-ng-dev:mips \
-            libcurl4-gnutls-dev:mips \
-            libdevmapper-dev:mips \
-            libfuse-dev:mips \
-            libglib2.0-dev:mips \
-            libglusterfs-dev:mips \
-            libgnutls28-dev:mips \
-            libiscsi-dev:mips \
-            libnl-3-dev:mips \
-            libnl-route-3-dev:mips \
-            libnuma-dev:mips \
-            libparted-dev:mips \
-            libpcap0.8-dev:mips \
-            libpciaccess-dev:mips \
-            librbd-dev:mips \
-            libreadline-dev:mips \
-            libsanlock-dev:mips \
-            libsasl2-dev:mips \
-            libselinux1-dev:mips \
-            libssh-gcrypt-dev:mips \
-            libssh2-1-dev:mips \
-            libtirpc-dev:mips \
-            libudev-dev:mips \
-            libxml2-dev:mips \
-            libyajl-dev:mips \
-            systemtap-sdt-dev:mips && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/mips-linux-gnu-gcc'\n\
-ar = '/usr/bin/mips-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/mips-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/mips-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mips'\n\
-endian = 'big'" > /usr/local/share/meson/cross/mips-linux-gnu && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips-linux-gnu-gcc
-
-ENV ABI "mips-linux-gnu"
-ENV MESON_OPTS "--cross-file=mips-linux-gnu"
diff --git a/ci/containers/debian-10-cross-mips64el.Dockerfile b/ci/containers/debian-10-cross-mips64el.Dockerfile
deleted file mode 100644
index 0cc7bc7034..0000000000
--- a/ci/containers/debian-10-cross-mips64el.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mips64el && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-mips64el-linux-gnuabi64 \
-            libacl1-dev:mips64el \
-            libapparmor-dev:mips64el \
-            libattr1-dev:mips64el \
-            libaudit-dev:mips64el \
-            libblkid-dev:mips64el \
-            libc6-dev:mips64el \
-            libcap-ng-dev:mips64el \
-            libcurl4-gnutls-dev:mips64el \
-            libdevmapper-dev:mips64el \
-            libfuse-dev:mips64el \
-            libglib2.0-dev:mips64el \
-            libglusterfs-dev:mips64el \
-            libgnutls28-dev:mips64el \
-            libiscsi-dev:mips64el \
-            libnl-3-dev:mips64el \
-            libnl-route-3-dev:mips64el \
-            libnuma-dev:mips64el \
-            libparted-dev:mips64el \
-            libpcap0.8-dev:mips64el \
-            libpciaccess-dev:mips64el \
-            librbd-dev:mips64el \
-            libreadline-dev:mips64el \
-            libsanlock-dev:mips64el \
-            libsasl2-dev:mips64el \
-            libselinux1-dev:mips64el \
-            libssh-gcrypt-dev:mips64el \
-            libssh2-1-dev:mips64el \
-            libtirpc-dev:mips64el \
-            libudev-dev:mips64el \
-            libxml2-dev:mips64el \
-            libyajl-dev:mips64el \
-            systemtap-sdt-dev:mips64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/mips64el-linux-gnuabi64-gcc'\n\
-ar = '/usr/bin/mips64el-linux-gnuabi64-gcc-ar'\n\
-strip = '/usr/bin/mips64el-linux-gnuabi64-strip'\n\
-pkgconfig = '/usr/bin/mips64el-linux-gnuabi64-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips64'\n\
-cpu = 'mips64el'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnuabi64-gcc
-
-ENV ABI "mips64el-linux-gnuabi64"
-ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64"
diff --git a/ci/containers/debian-10-cross-mipsel.Dockerfile b/ci/containers/debian-10-cross-mipsel.Dockerfile
deleted file mode 100644
index ae3fd260ea..0000000000
--- a/ci/containers/debian-10-cross-mipsel.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture mipsel && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-mipsel-linux-gnu \
-            libacl1-dev:mipsel \
-            libapparmor-dev:mipsel \
-            libattr1-dev:mipsel \
-            libaudit-dev:mipsel \
-            libblkid-dev:mipsel \
-            libc6-dev:mipsel \
-            libcap-ng-dev:mipsel \
-            libcurl4-gnutls-dev:mipsel \
-            libdevmapper-dev:mipsel \
-            libfuse-dev:mipsel \
-            libglib2.0-dev:mipsel \
-            libglusterfs-dev:mipsel \
-            libgnutls28-dev:mipsel \
-            libiscsi-dev:mipsel \
-            libnl-3-dev:mipsel \
-            libnl-route-3-dev:mipsel \
-            libnuma-dev:mipsel \
-            libparted-dev:mipsel \
-            libpcap0.8-dev:mipsel \
-            libpciaccess-dev:mipsel \
-            librbd-dev:mipsel \
-            libreadline-dev:mipsel \
-            libsanlock-dev:mipsel \
-            libsasl2-dev:mipsel \
-            libselinux1-dev:mipsel \
-            libssh-gcrypt-dev:mipsel \
-            libssh2-1-dev:mipsel \
-            libtirpc-dev:mipsel \
-            libudev-dev:mipsel \
-            libxml2-dev:mipsel \
-            libyajl-dev:mipsel \
-            systemtap-sdt-dev:mipsel && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/mipsel-linux-gnu-gcc'\n\
-ar = '/usr/bin/mipsel-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/mipsel-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/mipsel-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'mips'\n\
-cpu = 'mipsel'\n\
-endian = 'little'" > /usr/local/share/meson/cross/mipsel-linux-gnu && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc
-
-ENV ABI "mipsel-linux-gnu"
-ENV MESON_OPTS "--cross-file=mipsel-linux-gnu"
diff --git a/ci/containers/debian-10-cross-ppc64le.Dockerfile b/ci/containers/debian-10-cross-ppc64le.Dockerfile
deleted file mode 100644
index 7cd3a3a419..0000000000
--- a/ci/containers/debian-10-cross-ppc64le.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture ppc64el && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-powerpc64le-linux-gnu \
-            libacl1-dev:ppc64el \
-            libapparmor-dev:ppc64el \
-            libattr1-dev:ppc64el \
-            libaudit-dev:ppc64el \
-            libblkid-dev:ppc64el \
-            libc6-dev:ppc64el \
-            libcap-ng-dev:ppc64el \
-            libcurl4-gnutls-dev:ppc64el \
-            libdevmapper-dev:ppc64el \
-            libfuse-dev:ppc64el \
-            libglib2.0-dev:ppc64el \
-            libglusterfs-dev:ppc64el \
-            libgnutls28-dev:ppc64el \
-            libiscsi-dev:ppc64el \
-            libnl-3-dev:ppc64el \
-            libnl-route-3-dev:ppc64el \
-            libnuma-dev:ppc64el \
-            libparted-dev:ppc64el \
-            libpcap0.8-dev:ppc64el \
-            libpciaccess-dev:ppc64el \
-            librbd-dev:ppc64el \
-            libreadline-dev:ppc64el \
-            libsanlock-dev:ppc64el \
-            libsasl2-dev:ppc64el \
-            libselinux1-dev:ppc64el \
-            libssh-gcrypt-dev:ppc64el \
-            libssh2-1-dev:ppc64el \
-            libtirpc-dev:ppc64el \
-            libudev-dev:ppc64el \
-            libxml2-dev:ppc64el \
-            libyajl-dev:ppc64el \
-            systemtap-sdt-dev:ppc64el && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/powerpc64le-linux-gnu-gcc'\n\
-ar = '/usr/bin/powerpc64le-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/powerpc64le-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/powerpc64le-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 'ppc64'\n\
-cpu = 'powerpc64le'\n\
-endian = 'little'" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-gnu-gcc
-
-ENV ABI "powerpc64le-linux-gnu"
-ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu"
diff --git a/ci/containers/debian-10-cross-s390x.Dockerfile b/ci/containers/debian-10-cross-s390x.Dockerfile
deleted file mode 100644
index 589a5b1d9c..0000000000
--- a/ci/containers/debian-10-cross-s390x.Dockerfile
+++ /dev/null
@@ -1,124 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libc-dev-bin \
-            libxml2-utils \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    dpkg --add-architecture s390x && \
-    eatmydata apt-get update && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y dpkg-dev && \
-    eatmydata apt-get install --no-install-recommends -y \
-            gcc-s390x-linux-gnu \
-            libacl1-dev:s390x \
-            libapparmor-dev:s390x \
-            libattr1-dev:s390x \
-            libaudit-dev:s390x \
-            libblkid-dev:s390x \
-            libc6-dev:s390x \
-            libcap-ng-dev:s390x \
-            libcurl4-gnutls-dev:s390x \
-            libdevmapper-dev:s390x \
-            libfuse-dev:s390x \
-            libglib2.0-dev:s390x \
-            libglusterfs-dev:s390x \
-            libgnutls28-dev:s390x \
-            libiscsi-dev:s390x \
-            libnl-3-dev:s390x \
-            libnl-route-3-dev:s390x \
-            libnuma-dev:s390x \
-            libparted-dev:s390x \
-            libpcap0.8-dev:s390x \
-            libpciaccess-dev:s390x \
-            librbd-dev:s390x \
-            libreadline-dev:s390x \
-            libsanlock-dev:s390x \
-            libsasl2-dev:s390x \
-            libselinux1-dev:s390x \
-            libssh-gcrypt-dev:s390x \
-            libssh2-1-dev:s390x \
-            libtirpc-dev:s390x \
-            libudev-dev:s390x \
-            libxml2-dev:s390x \
-            libyajl-dev:s390x \
-            systemtap-sdt-dev:s390x && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    mkdir -p /usr/local/share/meson/cross && \
-    echo "[binaries]\n\
-c = '/usr/bin/s390x-linux-gnu-gcc'\n\
-ar = '/usr/bin/s390x-linux-gnu-gcc-ar'\n\
-strip = '/usr/bin/s390x-linux-gnu-strip'\n\
-pkgconfig = '/usr/bin/s390x-linux-gnu-pkg-config'\n\
-\n\
-[host_machine]\n\
-system = 'linux'\n\
-cpu_family = 's390x'\n\
-cpu = 's390x'\n\
-endian = 'big'" > /usr/local/share/meson/cross/s390x-linux-gnu && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc
-
-ENV ABI "s390x-linux-gnu"
-ENV MESON_OPTS "--cross-file=s390x-linux-gnu"
diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile
deleted file mode 100644
index 41691c708f..0000000000
--- a/ci/containers/debian-10.Dockerfile
+++ /dev/null
@@ -1,105 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool manifest ci/manifest.yml
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-FROM docker.io/library/debian:10-slim
-
-RUN export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && \
-    apt-get install -y eatmydata && \
-    eatmydata apt-get dist-upgrade -y && \
-    eatmydata apt-get install --no-install-recommends -y \
-            augeas-lenses \
-            augeas-tools \
-            bash-completion \
-            ca-certificates \
-            ccache \
-            clang \
-            codespell \
-            cpp \
-            diffutils \
-            dwarves \
-            ebtables \
-            flake8 \
-            gcc \
-            gettext \
-            git \
-            grep \
-            iproute2 \
-            iptables \
-            kmod \
-            libacl1-dev \
-            libapparmor-dev \
-            libattr1-dev \
-            libaudit-dev \
-            libblkid-dev \
-            libc-dev-bin \
-            libc6-dev \
-            libcap-ng-dev \
-            libcurl4-gnutls-dev \
-            libdevmapper-dev \
-            libfuse-dev \
-            libglib2.0-dev \
-            libglusterfs-dev \
-            libgnutls28-dev \
-            libiscsi-dev \
-            libnetcf-dev \
-            libnl-3-dev \
-            libnl-route-3-dev \
-            libnuma-dev \
-            libparted-dev \
-            libpcap0.8-dev \
-            libpciaccess-dev \
-            librbd-dev \
-            libreadline-dev \
-            libsanlock-dev \
-            libsasl2-dev \
-            libselinux1-dev \
-            libssh-gcrypt-dev \
-            libssh2-1-dev \
-            libtirpc-dev \
-            libudev-dev \
-            libxen-dev \
-            libxml2-dev \
-            libxml2-utils \
-            libyajl-dev \
-            locales \
-            lvm2 \
-            make \
-            nfs-common \
-            ninja-build \
-            numad \
-            open-iscsi \
-            perl-base \
-            pkgconf \
-            policykit-1 \
-            python3 \
-            python3-docutils \
-            python3-pip \
-            python3-setuptools \
-            python3-wheel \
-            qemu-utils \
-            scrub \
-            sed \
-            systemtap-sdt-dev \
-            wireshark-dev \
-            xsltproc && \
-    eatmydata apt-get autoremove -y && \
-    eatmydata apt-get autoclean -y && \
-    sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
-    dpkg-reconfigure locales && \
-    dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \
-    mkdir -p /usr/libexec/ccache-wrappers && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \
-    ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc
-
-RUN pip3 install meson==0.56.0
-
-ENV LANG "en_US.UTF-8"
-ENV MAKE "/usr/bin/make"
-ENV NINJA "/usr/bin/ninja"
-ENV PYTHON "/usr/bin/python3"
-ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml
index 953c1b078f..4e8c3d3510 100644
--- a/ci/gitlab/builds.yml
+++ b/ci/gitlab/builds.yml
@@ -79,17 +79,6 @@ x86_64-centos-stream-9:
       - libvirt-rpms


-x86_64-debian-10:
-  extends: .native_build_job
-  needs:
-    - job: x86_64-debian-10-container
-      optional: true
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
 x86_64-debian-11:
   extends: .native_build_job
   needs:
@@ -232,114 +221,6 @@ x86_64-ubuntu-2204-clang:

 # Cross build jobs

-aarch64-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: aarch64-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: aarch64
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-armv6l-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: armv6l-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: armv6l
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-armv7l-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: armv7l-debian-10-container
-      optional: true
-  allow_failure: false
-  variables:
-    CROSS: armv7l
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-i686-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: i686-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: i686
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-mips-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: mips-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: mips
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-mips64el-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: mips64el-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: mips64el
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-mipsel-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: mipsel-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: mipsel
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-ppc64le-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: ppc64le-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: ppc64le
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
-s390x-debian-10:
-  extends: .cross_build_job
-  needs:
-    - job: s390x-debian-10-container
-      optional: true
-  allow_failure: true
-  variables:
-    CROSS: s390x
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
 aarch64-debian-11:
   extends: .cross_build_job
   needs:
diff --git a/ci/gitlab/containers.yml b/ci/gitlab/containers.yml
index b77baf509e..1b7f63955b 100644
--- a/ci/gitlab/containers.yml
+++ b/ci/gitlab/containers.yml
@@ -42,14 +42,6 @@ x86_64-centos-stream-9-container:
     NAME: centos-stream-9


-x86_64-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10
-
-
 x86_64-debian-11-container:
   extends: .container_job
   allow_failure: false
@@ -116,78 +108,6 @@ x86_64-ubuntu-2204-container:

 # Cross container jobs

-aarch64-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-aarch64
-
-
-armv6l-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-armv6l
-
-
-armv7l-debian-10-container:
-  extends: .container_job
-  allow_failure: false
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-armv7l
-
-
-i686-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-i686
-
-
-mips-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-mips
-
-
-mips64el-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-mips64el
-
-
-mipsel-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-mipsel
-
-
-ppc64le-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-ppc64le
-
-
-s390x-debian-10-container:
-  extends: .container_job
-  allow_failure: true
-  variables:
-    JOB_OPTIONAL: 1
-    NAME: debian-10-cross-s390x
-
-
 aarch64-debian-11-container:
   extends: .container_job
   allow_failure: false
diff --git a/ci/manifest.yml b/ci/manifest.yml
index 01dc5e4c9a..0baa82b0f8 100644
--- a/ci/manifest.yml
+++ b/ci/manifest.yml
@@ -44,46 +44,6 @@ targets:
           paths:
             - libvirt-rpms

-  debian-10:
-    jobs:
-      - arch: x86_64
-        builds: false
-
-      - arch: aarch64
-        allow-failure: true
-        builds: false
-
-      - arch: armv6l
-        allow-failure: true
-        builds: false
-
-      - arch: armv7l
-        builds: false
-
-      - arch: i686
-        allow-failure: true
-        builds: false
-
-      - arch: mips
-        allow-failure: true
-        builds: false
-
-      - arch: mips64el
-        allow-failure: true
-        builds: false
-
-      - arch: mipsel
-        allow-failure: true
-        builds: false
-
-      - arch: ppc64le
-        allow-failure: true
-        builds: false
-
-      - arch: s390x
-        allow-failure: true
-        builds: false
-
   debian-11:
     jobs:
       - arch: x86_64
-- 
2.36.1


From khanicov at redhat.com  Fri Jul 22 11:15:01 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 13:15:01 +0200
Subject: [PATCH 1/2] qemu_hotplug: Close FDs in QEMU on failed chardev
 hotplug
In-Reply-To: <70fc16be273f60da3e4c4c595f000d62433a3d84.1658155738.git.mprivozn@redhat.com>
References: <cover.1658155738.git.mprivozn@redhat.com>
 <70fc16be273f60da3e4c4c595f000d62433a3d84.1658155738.git.mprivozn@redhat.com>
Message-ID: <CAJEdO+2GOjt6TD0THVYv_CjiJ7jN0QLSK2Ev5BWiA=D4R9k04g@mail.gmail.com>

On Mon, Jul 18, 2022 at 4:50 PM Michal Privoznik <mprivozn at redhat.com>
wrote:

> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_hotplug.c | 17 ++++++-----------
>  1 file changed, 6 insertions(+), 11 deletions(-)
>


Reviewed-by: Kristina Hanicova <khanicov at redhat.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/7aca6915/attachment.htm>

From khanicov at redhat.com  Fri Jul 22 12:16:47 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 14:16:47 +0200
Subject: [PATCH 2/2] qemu_hotplug: Create chardev files before attempting
 to relabel them
In-Reply-To: <37d992ee496f3e63639d575d6530d24dc20e2ca1.1658155738.git.mprivozn@redhat.com>
References: <cover.1658155738.git.mprivozn@redhat.com>
 <37d992ee496f3e63639d575d6530d24dc20e2ca1.1658155738.git.mprivozn@redhat.com>
Message-ID: <CAJEdO+14Ujrd5oDThnKBsT9hPWNjd4wNpKwbDKfK82h67ip7Bg@mail.gmail.com>

On Mon, Jul 18, 2022 at 4:50 PM Michal Privoznik <mprivozn at redhat.com>
wrote:

> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_hotplug.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
>

Reviewed-by: Kristina Hanicova <khanicov at redhat.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/75c709bd/attachment.htm>

From khanicov at redhat.com  Fri Jul 22 12:44:30 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 14:44:30 +0200
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <20220714055204.1277661-2-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-2-natto@weirdnatto.in>
Message-ID: <CAJEdO+3rm1VcGfh7gYNntSAzf4vDm-RceaUdoXe-RZC2+DuEWg@mail.gmail.com>

On Thu, Jul 14, 2022 at 7:54 AM Amneesh Singh <natto at weirdnatto.in> wrote:

> Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
> This patch adds an API for the "query-stats" QMP command.
>
> The query returns a JSON containing the statistics based on the target,
> which can either be vCPU or VM, and the providers. The API deserializes
> the query result into an array of GHashMaps, which can later be used to
> extract all the query statistics. GHashMaps are used to avoid traversing
> the entire array to find the statistics you are looking for. This would
> be a singleton array if the target is a VM since the returned JSON is
> also a singleton array in that case.
>
> Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
> ---
>  src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
>  src/qemu/qemu_monitor.h      |  45 ++++++++++++
>  src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
>  src/qemu/qemu_monitor_json.h |   6 ++
>  4 files changed, 251 insertions(+)
>
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index fda5d2f3..a07e6017 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -4541,3 +4541,73 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
>
>      return qemuMonitorJSONMigrateRecover(mon, uri);
>  }
> +
> +VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
> +              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
> +              "vm",
> +              "vcpu",
> +);
> +
> +VIR_ENUM_IMPL(qemuMonitorQueryStatsName,
> +              QEMU_MONITOR_QUERY_STATS_NAME_LAST,
> +              "halt_poll_success_ns",
> +              "halt_poll_fail_ns"
> +);
> +
> +VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
> +              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
> +              "kvm",
> +);
> +
> +void
> +qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
> +{
> +    virBitmapFree(provider->names);
> +    g_free(provider);
> +}
> +
> +qemuMonitorQueryStatsProvider *
> +qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType
> provider_type,
> +                                 ...)
> +{
> +    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
> +    qemuMonitorQueryStatsNameType stat;
> +    va_list name_list;
> +    size_t sentinel = QEMU_MONITOR_QUERY_STATS_NAME_LAST;
> +
> +    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
> +    provider->provider = provider_type;
> +    provider->names = NULL;
> +
> +    va_start(name_list, provider_type);
> +    stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
> +
> +    if (stat != sentinel) {
>

It would be better to compare 'stat' with QEMU_MONITOR_QUERY_STATS_NAME_LAST
directly without the additional variable 'sentinel'.


> +        provider->names =
> virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
> +
> +        while (stat != sentinel) {
>

Same here.


This while cycle would be better outside the if case, such as:

if (stat != sentinel)
    provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);

while (stat != sentinel) {
    ....
}

Because the 'while' cycle has the same condition as the 'if' case.


> +            if (virBitmapSetBit(provider->names, stat) < 0)
> +                return NULL;
> +            stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
> +        }
> +    }
> +    va_end(name_list);
> +
> +    return g_steal_pointer(&provider);
> +}
> +
> +GPtrArray *
> +qemuMonitorQueryStats(qemuMonitor *mon,
> +                      qemuMonitorQueryStatsTargetType target,
> +                      char **vcpus,
> +                      GPtrArray *providers)
> +{
> +    VIR_DEBUG("target=%u vcpus=%p providers=%p", target, vcpus,
> providers);
> +
> +    QEMU_CHECK_MONITOR_NULL(mon);
> +
> +    if (target != QEMU_MONITOR_QUERY_STATS_TARGET_VCPU && vcpus)
> +        return NULL;
> +
> +    return qemuMonitorJSONQueryStats(mon, target, vcpus, providers);
> +}
> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
> index 95267ec6..344636e1 100644
> --- a/src/qemu/qemu_monitor.h
> +++ b/src/qemu/qemu_monitor.h
> @@ -1554,3 +1554,48 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor
> *mon,
>  int
>  qemuMonitorMigrateRecover(qemuMonitor *mon,
>                            const char *uri);
> +
> +typedef enum {
> +    QEMU_MONITOR_QUERY_STATS_TARGET_VM,
> +    QEMU_MONITOR_QUERY_STATS_TARGET_VCPU,
> +    QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
> +} qemuMonitorQueryStatsTargetType;
> +
> +VIR_ENUM_DECL(qemuMonitorQueryStatsTarget);
> +
> +typedef enum {
> +    QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS,
> +    QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS,
> +    QEMU_MONITOR_QUERY_STATS_NAME_LAST,
> +} qemuMonitorQueryStatsNameType;
> +
> +VIR_ENUM_DECL(qemuMonitorQueryStatsName);
> +
> +typedef enum {
> +    QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
> +    QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
> +} qemuMonitorQueryStatsProviderType;
> +
> +VIR_ENUM_DECL(qemuMonitorQueryStatsProvider);
> +
> +typedef struct _qemuMonitorQueryStatsProvider
> qemuMonitorQueryStatsProvider;
> +struct _qemuMonitorQueryStatsProvider {
> +    qemuMonitorQueryStatsProviderType provider;
>

It is a bit confusing for me to have a variable 'provider' in the
'provider' structure.
Later you use provider->provider which is not very readable.
I would prefer 'type' (maybe even 'providerType') instead.


> +    virBitmap *names;
> +};
> +
> +void
> +qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider
> *provider);
> +
> +qemuMonitorQueryStatsProvider *
> +qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType
> provider_type,
> +                                 ...);
> +
> +G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuMonitorQueryStatsProvider,
> +                              qemuMonitorQueryStatsProviderFree);
> +
> +GPtrArray *
> +qemuMonitorQueryStats(qemuMonitor *mon,
> +                      qemuMonitorQueryStatsTargetType target,
> +                      char **vcpus,
> +                      GPtrArray *providers);
> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 80696de7..4e228bfb 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -9031,3 +9031,133 @@ qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
>
>      return qemuMonitorJSONCheckError(cmd, reply);
>  }
> +
> +static GPtrArray *
> +qemuMonitorJSONExtractQueryStats(virJSONValue *arr)
> +{
> +    g_autoptr(GPtrArray) queried_stats = NULL;
> +    size_t nstats = virJSONValueArraySize(arr);
> +    size_t i;
> +
> +    /* Create a GPtrArray for GHashTables */
> +    queried_stats = g_ptr_array_new_full(nstats, (GDestroyNotify)
> g_hash_table_destroy);
> +
> +    for (i = 0; i < nstats; i++) {
> +        virJSONValue *obj = virJSONValueArrayGet(arr, i);
> +        virJSONValue *stats = virJSONValueObjectGetArray(obj, "stats");
> +        size_t j;
> +
> +        /* Create a GHashTable for virJSONValues */
> +        GHashTable *hash_table = virHashNew((GDestroyNotify)
> virJSONValueFree);
> +
> +        for (j = 0; j < virJSONValueArraySize(stats); j++) {
> +            virJSONValue *stat = virJSONValueArrayGet(stats, j);
> +
> +            g_hash_table_insert(hash_table,
> +
> g_strdup(virJSONValueObjectGetString(stat, "name")),
> +                                virJSONValueObjectGet(stat, "value"));
> +        }
> +
> +        g_ptr_array_add(queried_stats, hash_table);
> +    }
> +
> +    return g_steal_pointer(&queried_stats);
> +}
> +
> +
> +/**
> + * qemuMonitorJSONQueryStats:
> + * @mon: monitor object
> + * @target: the target type for the query
> + * @vcpus: a list of vCPU QOM paths for filtering the statistics
> + * @providers: an array of providers to filter statistics
> + *
> + * @vcpus is a NULL terminated array of strings. @providers is a GPtrArray
> + * for qemuMonitorQueryStatsProvider.
> + * @vcpus and @providers are optional and can be NULL.
> + *
> + * Queries for the @target based statistics.
> + * Returns a GPtrArray of GHashTables containing the statistics on
> success or
> + * NULL on failure.
> + */
> +
> +GPtrArray *
> +qemuMonitorJSONQueryStats(qemuMonitor *mon,
> +                          qemuMonitorQueryStatsTargetType target,
> +                          char **vcpus,
> +                          GPtrArray *providers)
> +{
> +    g_autoptr(virJSONValue) cmd = NULL;
> +    g_autoptr(virJSONValue) reply = NULL;
> +    g_autoptr(virJSONValue) vcpu_list = NULL;
> +    g_autoptr(virJSONValue) provider_list = NULL;
> +    virJSONValue *rv = NULL;
> +
> +    size_t i;
> +
> +    if (providers) {
> +        provider_list = virJSONValueNewArray();
> +
> +        for (i = 0; i < providers->len; i++) {
> +            g_autoptr(virJSONValue) provider_obj =
> virJSONValueNewObject();
> +            qemuMonitorQueryStatsProvider *provider = providers->pdata[i];
> +            const char *type_str =
> qemuMonitorQueryStatsProviderTypeToString(provider->provider);
> +            virBitmap *names = provider->names;
> +            int rc;
> +
>

We usually use 'rc' (or any variable storing the result) if we need the
value also after the
check of its return code. When we only need to check the result, we usually
compare the
value directly:

if (virJSONValueObjectAppendString(provider_obj, "provider", type_str) < 0)
    return NULL;


> +            rc = virJSONValueObjectAppendString(provider_obj, "provider",
> type_str);
> +
> +            if (rc < 0)
> +                return NULL;
> +
> +            if (names) {
> +                g_autoptr(virJSONValue) provider_names =
> virJSONValueNewArray();
> +                int curBit = virBitmapNextSetBit(names, -1);
> +
> +                while (curBit >= 0) {
> +                    const char *name =
> qemuMonitorQueryStatsNameTypeToString(curBit);
> +
> +                    if (virJSONValueArrayAppendString(provider_names,
> name) < 0)
> +                        return NULL;
> +
> +                    curBit = virBitmapNextSetBit(names, curBit);
> +                }
> +
> +                rc = virJSONValueObjectAppend(provider_obj, "names",
> &provider_names);
> +
>

Same here


> +                if (rc < 0)
> +                    return NULL;
> +            }
> +
> +            if (virJSONValueArrayAppend(provider_list, &provider_obj) < 0)
> +                return NULL;
> +        }
> +    }
> +
> +    if (vcpus) {
> +        vcpu_list = virJSONValueNewArray();
> +
> +        for (i = 0; vcpus[i]; i++)
> +            if (virJSONValueArrayAppendString(vcpu_list, vcpus[i]) < 0)
> +                return NULL;
> +    }
> +
> +    cmd = qemuMonitorJSONMakeCommand("query-stats",
> +                                     "s:target",
> qemuMonitorQueryStatsTargetTypeToString(target),
> +                                     "A:vcpus", &vcpu_list,
> +                                     "A:providers", &provider_list,
> +                                     NULL);
> +
> +    if (!cmd)
> +        return NULL;
> +
> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> +        return NULL;
> +
> +    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
> +        return NULL;
> +
> +    rv = virJSONValueObjectStealArray(reply, "return");
> +
> +    return qemuMonitorJSONExtractQueryStats(rv);
> +}
> diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
> index ad3853ae..db8dec80 100644
> --- a/src/qemu/qemu_monitor_json.h
> +++ b/src/qemu/qemu_monitor_json.h
> @@ -878,3 +878,9 @@ qemuMonitorJSONChangeMemoryRequestedSize(qemuMonitor
> *mon,
>  int
>  qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
>                                const char *uri);
> +
> +GPtrArray *
> +qemuMonitorJSONQueryStats(qemuMonitor *mon,
> +                          qemuMonitorQueryStatsTargetType target,
> +                          char **vcpus,
> +                          GPtrArray *providers);
> --
> 2.36.1
>
>

Kind regards,
Kristina
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/e1ab1b73/attachment-0001.htm>

From pkrempa at redhat.com  Fri Jul 22 14:16:09 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 22 Jul 2022 16:16:09 +0200
Subject: [PATCH] tests: qemucapabilities: Update test data for the qemu-7.1
 cycle on x86_64
Message-ID: <8165923b0251d0d03550ba83eecbde4b1e9c197e.1658499361.git.pkrempa@redhat.com>

Update to v7.0.0-2780-g5288bee45f

Notable changes:
 - set-vcpu-dirty-limit/cancel-vcpu-dirty-limit/query-vcpu-dirty-limit command added
 - snapshot-save/snapshot-load command added
 - dirty-sync-missed-zero-copy migration statistic added
 - postcopy-preempt migration feature added
 - the 'copy-before-write' block driver gained:
    - 'cbw-timeout' property
    - 'on-cbw-error' property with values:
        - 'break-guest-write'
        - 'break-snapshot'

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../caps_7.1.0.x86_64.replies                 | 2870 +++++++++--------
 .../caps_7.1.0.x86_64.xml                     |    2 +-
 2 files changed, 1506 insertions(+), 1366 deletions(-)

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
index 025d2db895..d893d67ea8 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
@@ -21,7 +21,7 @@
       "minor": 0,
       "major": 7
     },
-    "package": "v7.0.0-2187-g2a8835cb45"
+    "package": "v7.0.0-2780-g5288bee45f"
   },
   "id": "libvirt-2"
 }
@@ -1032,56 +1032,74 @@
       "arg-type": "0"
     },
     {
-      "name": "snapshot-save",
+      "name": "set-vcpu-dirty-limit",
       "ret-type": "0",
       "meta-type": "command",
       "arg-type": "160"
     },
     {
-      "name": "snapshot-load",
+      "name": "cancel-vcpu-dirty-limit",
       "ret-type": "0",
       "meta-type": "command",
       "arg-type": "161"
     },
+    {
+      "name": "query-vcpu-dirty-limit",
+      "ret-type": "[162]",
+      "meta-type": "command",
+      "arg-type": "0"
+    },
+    {
+      "name": "snapshot-save",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "163"
+    },
+    {
+      "name": "snapshot-load",
+      "ret-type": "0",
+      "meta-type": "command",
+      "arg-type": "164"
+    },
     {
       "name": "snapshot-delete",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "162"
+      "arg-type": "165"
     },
     {
       "name": "transaction",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "163"
+      "arg-type": "166"
     },
     {
       "name": "trace-event-get-state",
-      "ret-type": "[165]",
+      "ret-type": "[168]",
       "meta-type": "command",
-      "arg-type": "164"
+      "arg-type": "167"
     },
     {
       "name": "trace-event-set-state",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "166"
+      "arg-type": "169"
     },
     {
       "name": "qmp_capabilities",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "167"
+      "arg-type": "170"
     },
     {
       "name": "query-version",
-      "ret-type": "168",
+      "ret-type": "171",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-commands",
-      "ret-type": "[169]",
+      "ret-type": "[172]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1093,63 +1111,63 @@
     },
     {
       "name": "query-qmp-schema",
-      "ret-type": "[170]",
+      "ret-type": "[173]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "qom-list",
-      "ret-type": "[172]",
+      "ret-type": "[175]",
       "meta-type": "command",
-      "arg-type": "171"
+      "arg-type": "174"
     },
     {
       "name": "qom-get",
       "ret-type": "any",
       "meta-type": "command",
-      "arg-type": "173"
+      "arg-type": "176"
     },
     {
       "name": "qom-set",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "174"
+      "arg-type": "177"
     },
     {
       "name": "qom-list-types",
-      "ret-type": "[176]",
+      "ret-type": "[179]",
       "meta-type": "command",
-      "arg-type": "175"
+      "arg-type": "178"
     },
     {
       "name": "qom-list-properties",
-      "ret-type": "[172]",
+      "ret-type": "[175]",
       "meta-type": "command",
-      "arg-type": "177"
+      "arg-type": "180"
     },
     {
       "name": "object-add",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "178"
+      "arg-type": "181"
     },
     {
       "name": "object-del",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "179"
+      "arg-type": "182"
     },
     {
       "name": "device-list-properties",
-      "ret-type": "[172]",
+      "ret-type": "[175]",
       "meta-type": "command",
-      "arg-type": "180"
+      "arg-type": "183"
     },
     {
       "name": "device_add",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "181",
+      "arg-type": "184",
       "features": [
         "json-cli",
         "json-cli-hotplug"
@@ -1159,51 +1177,51 @@
       "name": "device_del",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "182"
+      "arg-type": "185"
     },
     {
       "name": "DEVICE_DELETED",
       "meta-type": "event",
-      "arg-type": "183"
+      "arg-type": "186"
     },
     {
       "name": "DEVICE_UNPLUG_GUEST_ERROR",
       "meta-type": "event",
-      "arg-type": "184"
+      "arg-type": "187"
     },
     {
       "name": "query-cpus-fast",
-      "ret-type": "[185]",
+      "ret-type": "[188]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-machines",
-      "ret-type": "[186]",
+      "ret-type": "[189]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-current-machine",
-      "ret-type": "187",
+      "ret-type": "190",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-target",
-      "ret-type": "188",
+      "ret-type": "191",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-uuid",
-      "ret-type": "189",
+      "ret-type": "192",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-vm-generation-id",
-      "ret-type": "190",
+      "ret-type": "193",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1233,7 +1251,7 @@
     },
     {
       "name": "query-kvm",
-      "ret-type": "191",
+      "ret-type": "194",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1241,23 +1259,23 @@
       "name": "memsave",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "192"
+      "arg-type": "195"
     },
     {
       "name": "pmemsave",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "193"
+      "arg-type": "196"
     },
     {
       "name": "query-memdev",
-      "ret-type": "[194]",
+      "ret-type": "[197]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-hotpluggable-cpus",
-      "ret-type": "[195]",
+      "ret-type": "[198]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1265,53 +1283,53 @@
       "name": "set-numa-node",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "196"
+      "arg-type": "199"
     },
     {
       "name": "balloon",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "197"
+      "arg-type": "200"
     },
     {
       "name": "query-balloon",
-      "ret-type": "198",
+      "ret-type": "201",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "BALLOON_CHANGE",
       "meta-type": "event",
-      "arg-type": "199"
+      "arg-type": "202"
     },
     {
       "name": "query-memory-size-summary",
-      "ret-type": "200",
+      "ret-type": "203",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-memory-devices",
-      "ret-type": "[201]",
+      "ret-type": "[204]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "MEMORY_DEVICE_SIZE_CHANGE",
       "meta-type": "event",
-      "arg-type": "202"
+      "arg-type": "205"
     },
     {
       "name": "MEM_UNPLUG_ERROR",
       "meta-type": "event",
-      "arg-type": "203",
+      "arg-type": "206",
       "features": [
         "deprecated"
       ]
     },
     {
       "name": "x-query-irq",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1320,7 +1338,7 @@
     },
     {
       "name": "x-query-jit",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1329,7 +1347,7 @@
     },
     {
       "name": "x-query-numa",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1338,7 +1356,7 @@
     },
     {
       "name": "x-query-opcount",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1347,7 +1365,7 @@
     },
     {
       "name": "x-query-profile",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1356,7 +1374,7 @@
     },
     {
       "name": "x-query-ramblock",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1365,7 +1383,7 @@
     },
     {
       "name": "x-query-rdma",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1374,7 +1392,7 @@
     },
     {
       "name": "x-query-roms",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1383,7 +1401,7 @@
     },
     {
       "name": "x-query-usb",
-      "ret-type": "204",
+      "ret-type": "207",
       "meta-type": "command",
       "arg-type": "0",
       "features": [
@@ -1392,19 +1410,19 @@
     },
     {
       "name": "query-cpu-model-expansion",
-      "ret-type": "210",
+      "ret-type": "213",
       "meta-type": "command",
-      "arg-type": "209"
+      "arg-type": "212"
     },
     {
       "name": "query-cpu-definitions",
-      "ret-type": "[211]",
+      "ret-type": "[214]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-replay",
-      "ret-type": "212",
+      "ret-type": "215",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1412,7 +1430,7 @@
       "name": "replay-break",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "213"
+      "arg-type": "216"
     },
     {
       "name": "replay-delete-break",
@@ -1424,18 +1442,18 @@
       "name": "replay-seek",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "214"
+      "arg-type": "217"
     },
     {
       "name": "yank",
       "ret-type": "0",
       "allow-oob": true,
       "meta-type": "command",
-      "arg-type": "215"
+      "arg-type": "218"
     },
     {
       "name": "query-yank",
-      "ret-type": "[216]",
+      "ret-type": "[219]",
       "allow-oob": true,
       "meta-type": "command",
       "arg-type": "0"
@@ -1444,17 +1462,17 @@
       "name": "add_client",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "217"
+      "arg-type": "220"
     },
     {
       "name": "query-name",
-      "ret-type": "218",
+      "ret-type": "221",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-iothreads",
-      "ret-type": "[219]",
+      "ret-type": "[222]",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1483,7 +1501,7 @@
       "name": "human-monitor-command",
       "ret-type": "str",
       "meta-type": "command",
-      "arg-type": "220",
+      "arg-type": "223",
       "features": [
         "savevm-monitor-nodes"
       ]
@@ -1492,47 +1510,47 @@
       "name": "getfd",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "221"
+      "arg-type": "224"
     },
     {
       "name": "closefd",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "222"
+      "arg-type": "225"
     },
     {
       "name": "add-fd",
-      "ret-type": "224",
+      "ret-type": "227",
       "meta-type": "command",
-      "arg-type": "223"
+      "arg-type": "226"
     },
     {
       "name": "remove-fd",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "225"
+      "arg-type": "228"
     },
     {
       "name": "query-fdsets",
-      "ret-type": "[226]",
+      "ret-type": "[229]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-command-line-options",
-      "ret-type": "[228]",
+      "ret-type": "[231]",
       "meta-type": "command",
-      "arg-type": "227"
+      "arg-type": "230"
     },
     {
       "name": "RTC_CHANGE",
       "meta-type": "event",
-      "arg-type": "229"
+      "arg-type": "232"
     },
     {
       "name": "VFU_CLIENT_HANGUP",
       "meta-type": "event",
-      "arg-type": "230"
+      "arg-type": "233"
     },
     {
       "name": "rtc-reset-reinjection",
@@ -1542,19 +1560,19 @@
     },
     {
       "name": "query-sev",
-      "ret-type": "231",
+      "ret-type": "234",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-sev-launch-measure",
-      "ret-type": "232",
+      "ret-type": "235",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-sev-capabilities",
-      "ret-type": "233",
+      "ret-type": "236",
       "meta-type": "command",
       "arg-type": "0"
     },
@@ -1562,54 +1580,54 @@
       "name": "sev-inject-launch-secret",
       "ret-type": "0",
       "meta-type": "command",
-      "arg-type": "234"
+      "arg-type": "237"
     },
     {
       "name": "query-sev-attestation-report",
-      "ret-type": "236",
+      "ret-type": "239",
       "meta-type": "command",
-      "arg-type": "235"
+      "arg-type": "238"
     },
     {
       "name": "query-sgx",
-      "ret-type": "239",
+      "ret-type": "242",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-sgx-capabilities",
-      "ret-type": "239",
+      "ret-type": "242",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-acpi-ospm-status",
-      "ret-type": "[240]",
+      "ret-type": "[243]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "ACPI_DEVICE_OST",
       "meta-type": "event",
-      "arg-type": "241"
+      "arg-type": "244"
     },
     {
       "name": "query-pci",
-      "ret-type": "[242]",
+      "ret-type": "[245]",
       "meta-type": "command",
       "arg-type": "0"
     },
     {
       "name": "query-stats",
-      "ret-type": "[244]",
+      "ret-type": "[247]",
       "meta-type": "command",
-      "arg-type": "243"
+      "arg-type": "246"
     },
     {
       "name": "query-stats-schemas",
-      "ret-type": "[246]",
+      "ret-type": "[249]",
       "meta-type": "command",
-      "arg-type": "245"
+      "arg-type": "248"
     },
     {
       "name": "0",
@@ -1630,7 +1648,7 @@
         },
         {
           "name": "status",
-          "type": "247"
+          "type": "250"
         }
       ],
       "meta-type": "object"
@@ -1644,7 +1662,7 @@
         },
         {
           "name": "reason",
-          "type": "248"
+          "type": "251"
         }
       ],
       "meta-type": "object"
@@ -1658,7 +1676,7 @@
         },
         {
           "name": "reason",
-          "type": "248"
+          "type": "251"
         }
       ],
       "meta-type": "object"
@@ -1668,7 +1686,7 @@
       "members": [
         {
           "name": "action",
-          "type": "249"
+          "type": "252"
         }
       ],
       "meta-type": "object"
@@ -1678,7 +1696,7 @@
       "members": [
         {
           "name": "action",
-          "type": "249"
+          "type": "252"
         }
       ],
       "meta-type": "object"
@@ -1689,22 +1707,22 @@
         {
           "name": "reboot",
           "default": null,
-          "type": "250"
+          "type": "253"
         },
         {
           "name": "shutdown",
           "default": null,
-          "type": "251"
+          "type": "254"
         },
         {
           "name": "panic",
           "default": null,
-          "type": "252"
+          "type": "255"
         },
         {
           "name": "watchdog",
           "default": null,
-          "type": "249"
+          "type": "252"
         }
       ],
       "meta-type": "object"
@@ -1714,12 +1732,12 @@
       "members": [
         {
           "name": "action",
-          "type": "253"
+          "type": "256"
         },
         {
           "name": "info",
           "default": null,
-          "type": "254"
+          "type": "257"
         }
       ],
       "meta-type": "object"
@@ -1729,12 +1747,12 @@
       "members": [
         {
           "name": "action",
-          "type": "253"
+          "type": "256"
         },
         {
           "name": "info",
           "default": null,
-          "type": "254"
+          "type": "257"
         }
       ],
       "meta-type": "object"
@@ -1744,15 +1762,15 @@
       "members": [
         {
           "name": "recipient",
-          "type": "255"
+          "type": "258"
         },
         {
           "name": "action",
-          "type": "256"
+          "type": "259"
         },
         {
           "name": "flags",
-          "type": "257"
+          "type": "260"
         }
       ],
       "meta-type": "object"
@@ -1900,7 +1918,7 @@
         {
           "name": "read-only-mode",
           "default": null,
-          "type": "258"
+          "type": "261"
         }
       ],
       "meta-type": "object"
@@ -2122,7 +2140,7 @@
         {
           "name": "io-status",
           "default": null,
-          "type": "259"
+          "type": "262"
         }
       ],
       "meta-type": "object"
@@ -2163,12 +2181,12 @@
         },
         {
           "name": "stats",
-          "type": "260"
+          "type": "263"
         },
         {
           "name": "driver-specific",
           "default": null,
-          "type": "261"
+          "type": "264"
         },
         {
           "name": "parent",
@@ -2221,7 +2239,7 @@
         },
         {
           "name": "io-status",
-          "type": "259"
+          "type": "262"
         },
         {
           "name": "ready",
@@ -2229,7 +2247,7 @@
         },
         {
           "name": "status",
-          "type": "262"
+          "type": "265"
         },
         {
           "name": "auto-finalize",
@@ -2297,7 +2315,7 @@
         {
           "name": "mode",
           "default": null,
-          "type": "263"
+          "type": "266"
         }
       ],
       "meta-type": "object"
@@ -2385,7 +2403,7 @@
         {
           "name": "on-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "filter-node-name",
@@ -2419,7 +2437,7 @@
         },
         {
           "name": "sync",
-          "type": "265"
+          "type": "268"
         },
         {
           "name": "speed",
@@ -2434,7 +2452,7 @@
         {
           "name": "bitmap-mode",
           "default": null,
-          "type": "266"
+          "type": "269"
         },
         {
           "name": "compress",
@@ -2444,12 +2462,12 @@
         {
           "name": "on-source-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "on-target-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "auto-finalize",
@@ -2469,7 +2487,7 @@
         {
           "name": "x-perf",
           "default": null,
-          "type": "267",
+          "type": "270",
           "features": [
             "unstable"
           ]
@@ -2486,7 +2504,7 @@
         {
           "name": "mode",
           "default": null,
-          "type": "263"
+          "type": "266"
         }
       ],
       "meta-type": "object"
@@ -2505,7 +2523,7 @@
         },
         {
           "name": "sync",
-          "type": "265"
+          "type": "268"
         },
         {
           "name": "speed",
@@ -2520,7 +2538,7 @@
         {
           "name": "bitmap-mode",
           "default": null,
-          "type": "266"
+          "type": "269"
         },
         {
           "name": "compress",
@@ -2530,12 +2548,12 @@
         {
           "name": "on-source-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "on-target-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "auto-finalize",
@@ -2555,7 +2573,7 @@
         {
           "name": "x-perf",
           "default": null,
-          "type": "267",
+          "type": "270",
           "features": [
             "unstable"
           ]
@@ -2618,7 +2636,7 @@
         },
         {
           "name": "detect_zeroes",
-          "type": "268"
+          "type": "271"
         },
         {
           "name": "bps",
@@ -2646,7 +2664,7 @@
         },
         {
           "name": "image",
-          "type": "269"
+          "type": "272"
         },
         {
           "name": "bps_max",
@@ -2720,7 +2738,7 @@
         },
         {
           "name": "cache",
-          "type": "270"
+          "type": "273"
         },
         {
           "name": "write_threshold",
@@ -2729,7 +2747,7 @@
         {
           "name": "dirty-bitmaps",
           "default": null,
-          "type": "[271]"
+          "type": "[274]"
         }
       ],
       "meta-type": "object"
@@ -2739,11 +2757,11 @@
       "members": [
         {
           "name": "nodes",
-          "type": "[272]"
+          "type": "[275]"
         },
         {
           "name": "edges",
-          "type": "[273]"
+          "type": "[276]"
         }
       ],
       "meta-type": "object"
@@ -2781,12 +2799,12 @@
         },
         {
           "name": "sync",
-          "type": "265"
+          "type": "268"
         },
         {
           "name": "mode",
           "default": null,
-          "type": "263"
+          "type": "266"
         },
         {
           "name": "speed",
@@ -2806,12 +2824,12 @@
         {
           "name": "on-source-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "on-target-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "unmap",
@@ -2821,7 +2839,7 @@
         {
           "name": "copy-mode",
           "default": null,
-          "type": "274"
+          "type": "277"
         },
         {
           "name": "auto-finalize",
@@ -2892,7 +2910,7 @@
         },
         {
           "name": "bitmaps",
-          "type": "[275]"
+          "type": "[278]"
         }
       ],
       "meta-type": "object"
@@ -2930,7 +2948,7 @@
         },
         {
           "name": "sync",
-          "type": "265"
+          "type": "268"
         },
         {
           "name": "speed",
@@ -2950,12 +2968,12 @@
         {
           "name": "on-source-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "on-target-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "filter-node-name",
@@ -2965,7 +2983,7 @@
         {
           "name": "copy-mode",
           "default": null,
-          "type": "274"
+          "type": "277"
         },
         {
           "name": "auto-finalize",
@@ -3020,7 +3038,7 @@
         {
           "name": "on-error",
           "default": null,
-          "type": "264"
+          "type": "267"
         },
         {
           "name": "filter-node-name",
@@ -3125,177 +3143,177 @@
       "variants": [
         {
           "case": "blkdebug",
-          "type": "279"
+          "type": "282"
         },
         {
           "case": "blklogwrites",
-          "type": "280"
+          "type": "283"
         },
         {
           "case": "blkverify",
-          "type": "281"
+          "type": "284"
         },
         {
           "case": "blkreplay",
-          "type": "282"
+          "type": "285"
         },
         {
           "case": "bochs",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "cloop",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "compress",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "copy-before-write",
-          "type": "284"
+          "type": "287"
         },
         {
           "case": "copy-on-read",
-          "type": "285"
+          "type": "288"
         },
         {
           "case": "dmg",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "file",
-          "type": "286"
+          "type": "289"
         },
         {
           "case": "ftp",
-          "type": "287"
+          "type": "290"
         },
         {
           "case": "ftps",
-          "type": "288"
+          "type": "291"
         },
         {
           "case": "gluster",
-          "type": "289"
+          "type": "292"
         },
         {
           "case": "host_cdrom",
-          "type": "286"
+          "type": "289"
         },
         {
           "case": "host_device",
-          "type": "286"
+          "type": "289"
         },
         {
           "case": "http",
-          "type": "290"
+          "type": "293"
         },
         {
           "case": "https",
-          "type": "291"
+          "type": "294"
         },
         {
           "case": "iscsi",
-          "type": "292"
+          "type": "295"
         },
         {
           "case": "luks",
-          "type": "293"
+          "type": "296"
         },
         {
           "case": "nbd",
-          "type": "294"
+          "type": "297"
         },
         {
           "case": "nfs",
-          "type": "295"
+          "type": "298"
         },
         {
           "case": "null-aio",
-          "type": "296"
+          "type": "299"
         },
         {
           "case": "null-co",
-          "type": "296"
+          "type": "299"
         },
         {
           "case": "nvme",
-          "type": "297"
+          "type": "300"
         },
         {
           "case": "parallels",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "preallocate",
-          "type": "298"
+          "type": "301"
         },
         {
           "case": "qcow2",
-          "type": "299"
+          "type": "302"
         },
         {
           "case": "qcow",
-          "type": "300"
+          "type": "303"
         },
         {
           "case": "qed",
-          "type": "301"
+          "type": "304"
         },
         {
           "case": "quorum",
-          "type": "302"
+          "type": "305"
         },
         {
           "case": "raw",
-          "type": "303"
+          "type": "306"
         },
         {
           "case": "rbd",
-          "type": "304"
+          "type": "307"
         },
         {
           "case": "replication",
-          "type": "305"
+          "type": "308"
         },
         {
           "case": "snapshot-access",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "ssh",
-          "type": "306"
+          "type": "309"
         },
         {
           "case": "throttle",
-          "type": "307"
+          "type": "310"
         },
         {
           "case": "vdi",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "vhdx",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "vmdk",
-          "type": "301"
+          "type": "304"
         },
         {
           "case": "vpc",
-          "type": "283"
+          "type": "286"
         },
         {
           "case": "vvfat",
-          "type": "308"
+          "type": "311"
         }
       ],
       "members": [
         {
           "name": "driver",
-          "type": "276"
+          "type": "279"
         },
         {
           "name": "node-name",
@@ -3305,12 +3323,12 @@
         {
           "name": "discard",
           "default": null,
-          "type": "277"
+          "type": "280"
         },
         {
           "name": "cache",
           "default": null,
-          "type": "278"
+          "type": "281"
         },
         {
           "name": "read-only",
@@ -3330,7 +3348,7 @@
         {
           "name": "detect-zeroes",
           "default": null,
-          "type": "268"
+          "type": "271"
         }
       ],
       "meta-type": "object"
@@ -3364,7 +3382,7 @@
         },
         {
           "name": "options",
-          "type": "309"
+          "type": "312"
         }
       ],
       "meta-type": "object"
@@ -3382,7 +3400,7 @@
         },
         {
           "name": "options",
-          "type": "310"
+          "type": "313"
         },
         {
           "name": "force",
@@ -3439,11 +3457,11 @@
         },
         {
           "name": "operation",
-          "type": "311"
+          "type": "314"
         },
         {
           "name": "action",
-          "type": "312"
+          "type": "315"
         },
         {
           "name": "nospace",
@@ -3462,7 +3480,7 @@
       "members": [
         {
           "name": "type",
-          "type": "313"
+          "type": "316"
         },
         {
           "name": "device",
@@ -3493,7 +3511,7 @@
       "members": [
         {
           "name": "type",
-          "type": "313"
+          "type": "316"
         },
         {
           "name": "device",
@@ -3523,11 +3541,11 @@
         },
         {
           "name": "operation",
-          "type": "311"
+          "type": "314"
         },
         {
           "name": "action",
-          "type": "312"
+          "type": "315"
         }
       ],
       "meta-type": "object"
@@ -3537,7 +3555,7 @@
       "members": [
         {
           "name": "type",
-          "type": "313"
+          "type": "316"
         },
         {
           "name": "device",
@@ -3563,7 +3581,7 @@
       "members": [
         {
           "name": "type",
-          "type": "313"
+          "type": "316"
         },
         {
           "name": "id",
@@ -3633,7 +3651,7 @@
         },
         {
           "name": "iothread",
-          "type": "314"
+          "type": "317"
         },
         {
           "name": "force",
@@ -3666,7 +3684,7 @@
       "members": [
         {
           "name": "type",
-          "type": "315"
+          "type": "318"
         },
         {
           "name": "error",
@@ -3770,7 +3788,7 @@
         },
         {
           "name": "status",
-          "type": "262"
+          "type": "265"
         }
       ],
       "meta-type": "object"
@@ -3849,11 +3867,11 @@
         },
         {
           "name": "type",
-          "type": "313"
+          "type": "316"
         },
         {
           "name": "status",
-          "type": "262"
+          "type": "265"
         },
         {
           "name": "current-progress",
@@ -3876,7 +3894,7 @@
       "members": [
         {
           "name": "addr",
-          "type": "316"
+          "type": "319"
         },
         {
           "name": "tls-creds",
@@ -3936,7 +3954,7 @@
         {
           "name": "mode",
           "default": null,
-          "type": "317"
+          "type": "320"
         }
       ],
       "meta-type": "object"
@@ -3947,25 +3965,25 @@
       "variants": [
         {
           "case": "nbd",
-          "type": "319"
+          "type": "322"
         },
         {
           "case": "vhost-user-blk",
-          "type": "320"
+          "type": "323"
         },
         {
           "case": "fuse",
-          "type": "321"
+          "type": "324"
         },
         {
           "case": "vduse-blk",
-          "type": "322"
+          "type": "325"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "318"
+          "type": "321"
         },
         {
           "name": "id",
@@ -4008,7 +4026,7 @@
         {
           "name": "mode",
           "default": null,
-          "type": "317"
+          "type": "320"
         }
       ],
       "meta-type": "object"
@@ -4037,7 +4055,7 @@
         },
         {
           "name": "type",
-          "type": "318"
+          "type": "321"
         },
         {
           "name": "node-name",
@@ -4102,7 +4120,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "323"
+          "type": "326"
         }
       ],
       "meta-type": "object"
@@ -4121,7 +4139,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "323"
+          "type": "326"
         }
       ],
       "meta-type": "object"
@@ -4140,7 +4158,7 @@
         },
         {
           "name": "backend",
-          "type": "324"
+          "type": "327"
         }
       ],
       "meta-type": "object"
@@ -4165,7 +4183,7 @@
         },
         {
           "name": "backend",
-          "type": "324"
+          "type": "327"
         }
       ],
       "meta-type": "object"
@@ -4233,7 +4251,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "325"
+          "type": "328"
         }
       ],
       "meta-type": "object"
@@ -4243,7 +4261,7 @@
       "members": [
         {
           "name": "status",
-          "type": "326"
+          "type": "329"
         },
         {
           "name": "completed",
@@ -4276,7 +4294,7 @@
       "members": [
         {
           "name": "formats",
-          "type": "[325]"
+          "type": "[328]"
         }
       ],
       "meta-type": "object"
@@ -4301,47 +4319,47 @@
       "variants": [
         {
           "case": "nic",
-          "type": "328"
+          "type": "331"
         },
         {
           "case": "user",
-          "type": "329"
+          "type": "332"
         },
         {
           "case": "tap",
-          "type": "330"
+          "type": "333"
         },
         {
           "case": "l2tpv3",
-          "type": "331"
+          "type": "334"
         },
         {
           "case": "socket",
-          "type": "332"
+          "type": "335"
         },
         {
           "case": "vde",
-          "type": "333"
+          "type": "336"
         },
         {
           "case": "bridge",
-          "type": "334"
+          "type": "337"
         },
         {
           "case": "hubport",
-          "type": "335"
+          "type": "338"
         },
         {
           "case": "netmap",
-          "type": "336"
+          "type": "339"
         },
         {
           "case": "vhost-user",
-          "type": "337"
+          "type": "340"
         },
         {
           "case": "vhost-vdpa",
-          "type": "338"
+          "type": "341"
         },
         {
           "case": "none",
@@ -4355,7 +4373,7 @@
         },
         {
           "name": "type",
-          "type": "327"
+          "type": "330"
         }
       ],
       "meta-type": "object"
@@ -4399,15 +4417,15 @@
         },
         {
           "name": "multicast",
-          "type": "342"
+          "type": "345"
         },
         {
           "name": "unicast",
-          "type": "342"
+          "type": "345"
         },
         {
           "name": "vlan",
-          "type": "342"
+          "type": "345"
         },
         {
           "name": "broadcast-allowed",
@@ -4583,11 +4601,11 @@
         },
         {
           "name": "duplex",
-          "type": "343"
+          "type": "346"
         },
         {
           "name": "autoneg",
-          "type": "344"
+          "type": "347"
         }
       ],
       "meta-type": "object"
@@ -4625,15 +4643,15 @@
         },
         {
           "name": "key",
-          "type": "345"
+          "type": "348"
         },
         {
           "name": "mask",
-          "type": "346"
+          "type": "349"
         },
         {
           "name": "action",
-          "type": "347"
+          "type": "350"
         }
       ],
       "meta-type": "object"
@@ -4791,7 +4809,7 @@
         },
         {
           "name": "options",
-          "type": "348"
+          "type": "351"
         }
       ],
       "meta-type": "object"
@@ -4802,7 +4820,7 @@
       "variants": [
         {
           "case": "vnc",
-          "type": "351"
+          "type": "354"
         },
         {
           "case": "spice",
@@ -4812,7 +4830,7 @@
       "members": [
         {
           "name": "protocol",
-          "type": "349"
+          "type": "352"
         },
         {
           "name": "password",
@@ -4821,7 +4839,7 @@
         {
           "name": "connected",
           "default": null,
-          "type": "350"
+          "type": "353"
         }
       ],
       "meta-type": "object"
@@ -4832,7 +4850,7 @@
       "variants": [
         {
           "case": "vnc",
-          "type": "352"
+          "type": "355"
         },
         {
           "case": "spice",
@@ -4842,7 +4860,7 @@
       "members": [
         {
           "name": "protocol",
-          "type": "349"
+          "type": "352"
         },
         {
           "name": "time",
@@ -4871,7 +4889,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "353"
+          "type": "356"
         }
       ],
       "meta-type": "object"
@@ -4914,12 +4932,12 @@
         },
         {
           "name": "mouse-mode",
-          "type": "354"
+          "type": "357"
         },
         {
           "name": "channels",
           "default": null,
-          "type": "[355]"
+          "type": "[358]"
         }
       ],
       "meta-type": "object"
@@ -4929,11 +4947,11 @@
       "members": [
         {
           "name": "server",
-          "type": "356"
+          "type": "359"
         },
         {
           "name": "client",
-          "type": "356"
+          "type": "359"
         }
       ],
       "meta-type": "object"
@@ -4943,11 +4961,11 @@
       "members": [
         {
           "name": "server",
-          "type": "357"
+          "type": "360"
         },
         {
           "name": "client",
-          "type": "355"
+          "type": "358"
         }
       ],
       "meta-type": "object"
@@ -4957,11 +4975,11 @@
       "members": [
         {
           "name": "server",
-          "type": "356"
+          "type": "359"
         },
         {
           "name": "client",
-          "type": "356"
+          "type": "359"
         }
       ],
       "meta-type": "object"
@@ -4981,7 +4999,7 @@
         {
           "name": "family",
           "default": null,
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "service",
@@ -4996,7 +5014,7 @@
         {
           "name": "clients",
           "default": null,
-          "type": "[359]"
+          "type": "[362]"
         }
       ],
       "meta-type": "object"
@@ -5015,20 +5033,20 @@
         },
         {
           "name": "server",
-          "type": "[360]"
+          "type": "[363]"
         },
         {
           "name": "clients",
-          "type": "[359]"
+          "type": "[362]"
         },
         {
           "name": "auth",
-          "type": "361"
+          "type": "364"
         },
         {
           "name": "vencrypt",
           "default": null,
-          "type": "362"
+          "type": "365"
         },
         {
           "name": "display",
@@ -5053,11 +5071,11 @@
       "members": [
         {
           "name": "server",
-          "type": "363"
+          "type": "366"
         },
         {
           "name": "client",
-          "type": "364"
+          "type": "367"
         }
       ],
       "meta-type": "object"
@@ -5067,11 +5085,11 @@
       "members": [
         {
           "name": "server",
-          "type": "363"
+          "type": "366"
         },
         {
           "name": "client",
-          "type": "359"
+          "type": "362"
         }
       ],
       "meta-type": "object"
@@ -5081,11 +5099,11 @@
       "members": [
         {
           "name": "server",
-          "type": "363"
+          "type": "366"
         },
         {
           "name": "client",
-          "type": "359"
+          "type": "362"
         }
       ],
       "meta-type": "object"
@@ -5122,7 +5140,7 @@
       "members": [
         {
           "name": "keys",
-          "type": "[365]"
+          "type": "[368]"
         },
         {
           "name": "hold-time",
@@ -5147,7 +5165,7 @@
         },
         {
           "name": "events",
-          "type": "[366]"
+          "type": "[369]"
         }
       ],
       "meta-type": "object"
@@ -5158,19 +5176,19 @@
       "variants": [
         {
           "case": "curses",
-          "type": "371"
+          "type": "374"
         },
         {
           "case": "egl-headless",
-          "type": "372"
+          "type": "375"
         },
         {
           "case": "dbus",
-          "type": "373"
+          "type": "376"
         },
         {
           "case": "sdl",
-          "type": "374"
+          "type": "377"
         },
         {
           "case": "default",
@@ -5188,7 +5206,7 @@
       "members": [
         {
           "name": "type",
-          "type": "367"
+          "type": "370"
         },
         {
           "name": "full-screen",
@@ -5208,7 +5226,7 @@
         {
           "name": "gl",
           "default": null,
-          "type": "368"
+          "type": "371"
         }
       ],
       "meta-type": "object"
@@ -5219,13 +5237,13 @@
       "variants": [
         {
           "case": "vnc",
-          "type": "376"
+          "type": "379"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "375"
+          "type": "378"
         }
       ],
       "meta-type": "object"
@@ -5236,13 +5254,13 @@
       "variants": [
         {
           "case": "vnc",
-          "type": "378"
+          "type": "381"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "377"
+          "type": "380"
         }
       ],
       "meta-type": "object"
@@ -5253,27 +5271,27 @@
         {
           "name": "status",
           "default": null,
-          "type": "379"
+          "type": "382"
         },
         {
           "name": "ram",
           "default": null,
-          "type": "380"
+          "type": "383"
         },
         {
           "name": "disk",
           "default": null,
-          "type": "380"
+          "type": "383"
         },
         {
           "name": "vfio",
           "default": null,
-          "type": "381"
+          "type": "384"
         },
         {
           "name": "xbzrle-cache",
           "default": null,
-          "type": "382"
+          "type": "385"
         },
         {
           "name": "total-time",
@@ -5323,12 +5341,12 @@
         {
           "name": "compression",
           "default": null,
-          "type": "383"
+          "type": "386"
         },
         {
           "name": "socket-address",
           "default": null,
-          "type": "[384]"
+          "type": "[387]"
         }
       ],
       "meta-type": "object"
@@ -5353,7 +5371,7 @@
       "members": [
         {
           "name": "capability",
-          "type": "385"
+          "type": "388"
         },
         {
           "name": "state",
@@ -5428,17 +5446,17 @@
         {
           "name": "tls-creds",
           "default": null,
-          "type": "314"
+          "type": "317"
         },
         {
           "name": "tls-hostname",
           "default": null,
-          "type": "314"
+          "type": "317"
         },
         {
           "name": "tls-authz",
           "default": null,
-          "type": "314"
+          "type": "317"
         },
         {
           "name": "max-bandwidth",
@@ -5486,7 +5504,7 @@
         {
           "name": "multifd-compression",
           "default": null,
-          "type": "386"
+          "type": "389"
         },
         {
           "name": "multifd-zlib-level",
@@ -5501,7 +5519,7 @@
         {
           "name": "block-bitmap-mapping",
           "default": null,
-          "type": "[387]"
+          "type": "[390]"
         }
       ],
       "meta-type": "object"
@@ -5630,7 +5648,7 @@
         {
           "name": "multifd-compression",
           "default": null,
-          "type": "386"
+          "type": "389"
         },
         {
           "name": "multifd-zlib-level",
@@ -5645,7 +5663,7 @@
         {
           "name": "block-bitmap-mapping",
           "default": null,
-          "type": "[387]"
+          "type": "[390]"
         }
       ],
       "meta-type": "object"
@@ -5684,7 +5702,7 @@
       "members": [
         {
           "name": "status",
-          "type": "379"
+          "type": "382"
         }
       ],
       "meta-type": "object"
@@ -5704,11 +5722,11 @@
       "members": [
         {
           "name": "mode",
-          "type": "388"
+          "type": "391"
         },
         {
           "name": "reason",
-          "type": "389"
+          "type": "392"
         }
       ],
       "meta-type": "object"
@@ -5718,7 +5736,7 @@
       "members": [
         {
           "name": "state",
-          "type": "379"
+          "type": "382"
         }
       ],
       "meta-type": "object"
@@ -5837,15 +5855,15 @@
       "members": [
         {
           "name": "mode",
-          "type": "388"
+          "type": "391"
         },
         {
           "name": "last-mode",
-          "type": "388"
+          "type": "391"
         },
         {
           "name": "reason",
-          "type": "389"
+          "type": "392"
         }
       ],
       "meta-type": "object"
@@ -5885,7 +5903,7 @@
         {
           "name": "mode",
           "default": null,
-          "type": "390"
+          "type": "393"
         }
       ],
       "meta-type": "object"
@@ -5900,7 +5918,7 @@
         },
         {
           "name": "status",
-          "type": "391"
+          "type": "394"
         },
         {
           "name": "start-time",
@@ -5916,18 +5934,67 @@
         },
         {
           "name": "mode",
-          "type": "390"
+          "type": "393"
         },
         {
           "name": "vcpu-dirty-rate",
           "default": null,
-          "type": "[392]"
+          "type": "[395]"
         }
       ],
       "meta-type": "object"
     },
     {
       "name": "160",
+      "members": [
+        {
+          "name": "cpu-index",
+          "default": null,
+          "type": "int"
+        },
+        {
+          "name": "dirty-rate",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "161",
+      "members": [
+        {
+          "name": "cpu-index",
+          "default": null,
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "[162]",
+      "element-type": "162",
+      "meta-type": "array"
+    },
+    {
+      "name": "162",
+      "members": [
+        {
+          "name": "cpu-index",
+          "type": "int"
+        },
+        {
+          "name": "limit-rate",
+          "type": "int"
+        },
+        {
+          "name": "current-rate",
+          "type": "int"
+        }
+      ],
+      "meta-type": "object"
+    },
+    {
+      "name": "163",
       "members": [
         {
           "name": "job-id",
@@ -5949,7 +6016,7 @@
       "meta-type": "object"
     },
     {
-      "name": "161",
+      "name": "164",
       "members": [
         {
           "name": "job-id",
@@ -5971,7 +6038,7 @@
       "meta-type": "object"
     },
     {
-      "name": "162",
+      "name": "165",
       "members": [
         {
           "name": "job-id",
@@ -5989,22 +6056,22 @@
       "meta-type": "object"
     },
     {
-      "name": "163",
+      "name": "166",
       "members": [
         {
           "name": "actions",
-          "type": "[393]"
+          "type": "[396]"
         },
         {
           "name": "properties",
           "default": null,
-          "type": "394"
+          "type": "397"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "164",
+      "name": "167",
       "members": [
         {
           "name": "name",
@@ -6019,12 +6086,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[165]",
-      "element-type": "165",
+      "name": "[168]",
+      "element-type": "168",
       "meta-type": "array"
     },
     {
-      "name": "165",
+      "name": "168",
       "members": [
         {
           "name": "name",
@@ -6032,7 +6099,7 @@
         },
         {
           "name": "state",
-          "type": "395"
+          "type": "398"
         },
         {
           "name": "vcpu",
@@ -6042,7 +6109,7 @@
       "meta-type": "object"
     },
     {
-      "name": "166",
+      "name": "169",
       "members": [
         {
           "name": "name",
@@ -6066,22 +6133,22 @@
       "meta-type": "object"
     },
     {
-      "name": "167",
+      "name": "170",
       "members": [
         {
           "name": "enable",
           "default": null,
-          "type": "[396]"
+          "type": "[399]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "168",
+      "name": "171",
       "members": [
         {
           "name": "qemu",
-          "type": "397"
+          "type": "400"
         },
         {
           "name": "package",
@@ -6091,12 +6158,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[169]",
-      "element-type": "169",
+      "name": "[172]",
+      "element-type": "172",
       "meta-type": "array"
     },
     {
-      "name": "169",
+      "name": "172",
       "members": [
         {
           "name": "name",
@@ -6106,41 +6173,41 @@
       "meta-type": "object"
     },
     {
-      "name": "[170]",
-      "element-type": "170",
+      "name": "[173]",
+      "element-type": "173",
       "meta-type": "array"
     },
     {
-      "name": "170",
+      "name": "173",
       "tag": "meta-type",
       "variants": [
         {
           "case": "builtin",
-          "type": "399"
+          "type": "402"
         },
         {
           "case": "enum",
-          "type": "400"
+          "type": "403"
         },
         {
           "case": "array",
-          "type": "401"
+          "type": "404"
         },
         {
           "case": "object",
-          "type": "402"
+          "type": "405"
         },
         {
           "case": "alternate",
-          "type": "403"
+          "type": "406"
         },
         {
           "case": "command",
-          "type": "404"
+          "type": "407"
         },
         {
           "case": "event",
-          "type": "405"
+          "type": "408"
         }
       ],
       "members": [
@@ -6150,7 +6217,7 @@
         },
         {
           "name": "meta-type",
-          "type": "398"
+          "type": "401"
         },
         {
           "name": "features",
@@ -6161,7 +6228,7 @@
       "meta-type": "object"
     },
     {
-      "name": "171",
+      "name": "174",
       "members": [
         {
           "name": "path",
@@ -6171,12 +6238,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[172]",
-      "element-type": "172",
+      "name": "[175]",
+      "element-type": "175",
       "meta-type": "array"
     },
     {
-      "name": "172",
+      "name": "175",
       "members": [
         {
           "name": "name",
@@ -6200,7 +6267,7 @@
       "meta-type": "object"
     },
     {
-      "name": "173",
+      "name": "176",
       "members": [
         {
           "name": "path",
@@ -6219,7 +6286,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "174",
+      "name": "177",
       "members": [
         {
           "name": "path",
@@ -6237,7 +6304,7 @@
       "meta-type": "object"
     },
     {
-      "name": "175",
+      "name": "178",
       "members": [
         {
           "name": "implements",
@@ -6253,12 +6320,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[176]",
-      "element-type": "176",
+      "name": "[179]",
+      "element-type": "179",
       "meta-type": "array"
     },
     {
-      "name": "176",
+      "name": "179",
       "members": [
         {
           "name": "name",
@@ -6278,7 +6345,7 @@
       "meta-type": "object"
     },
     {
-      "name": "177",
+      "name": "180",
       "members": [
         {
           "name": "typename",
@@ -6288,164 +6355,164 @@
       "meta-type": "object"
     },
     {
-      "name": "178",
+      "name": "181",
       "tag": "qom-type",
       "variants": [
         {
           "case": "authz-list",
-          "type": "407"
+          "type": "410"
         },
         {
           "case": "authz-listfile",
-          "type": "408"
+          "type": "411"
         },
         {
           "case": "authz-pam",
-          "type": "409"
+          "type": "412"
         },
         {
           "case": "authz-simple",
-          "type": "410"
+          "type": "413"
         },
         {
           "case": "can-host-socketcan",
-          "type": "411"
+          "type": "414"
         },
         {
           "case": "colo-compare",
-          "type": "412"
+          "type": "415"
         },
         {
           "case": "cryptodev-backend",
-          "type": "413"
+          "type": "416"
         },
         {
           "case": "cryptodev-backend-builtin",
-          "type": "413"
+          "type": "416"
         },
         {
           "case": "cryptodev-vhost-user",
-          "type": "414"
+          "type": "417"
         },
         {
           "case": "dbus-vmstate",
-          "type": "415"
+          "type": "418"
         },
         {
           "case": "filter-buffer",
-          "type": "416"
+          "type": "419"
         },
         {
           "case": "filter-dump",
-          "type": "417"
+          "type": "420"
         },
         {
           "case": "filter-mirror",
-          "type": "418"
+          "type": "421"
         },
         {
           "case": "filter-redirector",
-          "type": "419"
+          "type": "422"
         },
         {
           "case": "filter-replay",
-          "type": "420"
+          "type": "423"
         },
         {
           "case": "filter-rewriter",
-          "type": "421"
+          "type": "424"
         },
         {
           "case": "input-barrier",
-          "type": "422"
+          "type": "425"
         },
         {
           "case": "input-linux",
-          "type": "423"
+          "type": "426"
         },
         {
           "case": "iothread",
-          "type": "424"
+          "type": "427"
         },
         {
           "case": "main-loop",
-          "type": "425"
+          "type": "428"
         },
         {
           "case": "memory-backend-epc",
-          "type": "426"
+          "type": "429"
         },
         {
           "case": "memory-backend-file",
-          "type": "427"
+          "type": "430"
         },
         {
           "case": "memory-backend-memfd",
-          "type": "428"
+          "type": "431"
         },
         {
           "case": "memory-backend-ram",
-          "type": "429"
+          "type": "432"
         },
         {
           "case": "pr-manager-helper",
-          "type": "430"
+          "type": "433"
         },
         {
           "case": "qtest",
-          "type": "431"
+          "type": "434"
         },
         {
           "case": "rng-builtin",
-          "type": "432"
+          "type": "435"
         },
         {
           "case": "rng-egd",
-          "type": "433"
+          "type": "436"
         },
         {
           "case": "rng-random",
-          "type": "434"
+          "type": "437"
         },
         {
           "case": "secret",
-          "type": "435"
+          "type": "438"
         },
         {
           "case": "secret_keyring",
-          "type": "436"
+          "type": "439"
         },
         {
           "case": "sev-guest",
-          "type": "437"
+          "type": "440"
         },
         {
           "case": "throttle-group",
-          "type": "438"
+          "type": "441"
         },
         {
           "case": "tls-creds-anon",
-          "type": "439"
+          "type": "442"
         },
         {
           "case": "tls-creds-psk",
-          "type": "440"
+          "type": "443"
         },
         {
           "case": "tls-creds-x509",
-          "type": "441"
+          "type": "444"
         },
         {
           "case": "tls-cipher-suites",
-          "type": "442"
+          "type": "445"
         },
         {
           "case": "x-remote-object",
-          "type": "443"
+          "type": "446"
         },
         {
           "case": "x-vfio-user-server",
-          "type": "444"
+          "type": "447"
         },
         {
           "case": "can-bus",
@@ -6463,7 +6530,7 @@
       "members": [
         {
           "name": "qom-type",
-          "type": "406"
+          "type": "409"
         },
         {
           "name": "id",
@@ -6473,7 +6540,7 @@
       "meta-type": "object"
     },
     {
-      "name": "179",
+      "name": "182",
       "members": [
         {
           "name": "id",
@@ -6483,7 +6550,7 @@
       "meta-type": "object"
     },
     {
-      "name": "180",
+      "name": "183",
       "members": [
         {
           "name": "typename",
@@ -6493,7 +6560,7 @@
       "meta-type": "object"
     },
     {
-      "name": "181",
+      "name": "184",
       "members": [
         {
           "name": "driver",
@@ -6513,7 +6580,7 @@
       "meta-type": "object"
     },
     {
-      "name": "182",
+      "name": "185",
       "members": [
         {
           "name": "id",
@@ -6523,7 +6590,7 @@
       "meta-type": "object"
     },
     {
-      "name": "183",
+      "name": "186",
       "members": [
         {
           "name": "device",
@@ -6538,7 +6605,7 @@
       "meta-type": "object"
     },
     {
-      "name": "184",
+      "name": "187",
       "members": [
         {
           "name": "device",
@@ -6553,17 +6620,17 @@
       "meta-type": "object"
     },
     {
-      "name": "[185]",
-      "element-type": "185",
+      "name": "[188]",
+      "element-type": "188",
       "meta-type": "array"
     },
     {
-      "name": "185",
+      "name": "188",
       "tag": "target",
       "variants": [
         {
           "case": "s390x",
-          "type": "447"
+          "type": "450"
         },
         {
           "case": "aarch64",
@@ -6702,22 +6769,22 @@
         {
           "name": "props",
           "default": null,
-          "type": "445"
+          "type": "448"
         },
         {
           "name": "target",
-          "type": "446"
+          "type": "449"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[186]",
-      "element-type": "186",
+      "name": "[189]",
+      "element-type": "189",
       "meta-type": "array"
     },
     {
-      "name": "186",
+      "name": "189",
       "members": [
         {
           "name": "name",
@@ -6763,7 +6830,7 @@
       "meta-type": "object"
     },
     {
-      "name": "187",
+      "name": "190",
       "members": [
         {
           "name": "wakeup-suspend-support",
@@ -6773,17 +6840,17 @@
       "meta-type": "object"
     },
     {
-      "name": "188",
+      "name": "191",
       "members": [
         {
           "name": "arch",
-          "type": "446"
+          "type": "449"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "189",
+      "name": "192",
       "members": [
         {
           "name": "UUID",
@@ -6793,7 +6860,7 @@
       "meta-type": "object"
     },
     {
-      "name": "190",
+      "name": "193",
       "members": [
         {
           "name": "guid",
@@ -6803,7 +6870,7 @@
       "meta-type": "object"
     },
     {
-      "name": "191",
+      "name": "194",
       "members": [
         {
           "name": "enabled",
@@ -6817,7 +6884,7 @@
       "meta-type": "object"
     },
     {
-      "name": "192",
+      "name": "195",
       "members": [
         {
           "name": "val",
@@ -6840,7 +6907,7 @@
       "meta-type": "object"
     },
     {
-      "name": "193",
+      "name": "196",
       "members": [
         {
           "name": "val",
@@ -6858,12 +6925,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[194]",
-      "element-type": "194",
+      "name": "[197]",
+      "element-type": "197",
       "meta-type": "array"
     },
     {
-      "name": "194",
+      "name": "197",
       "members": [
         {
           "name": "id",
@@ -6901,18 +6968,18 @@
         },
         {
           "name": "policy",
-          "type": "448"
+          "type": "451"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[195]",
-      "element-type": "195",
+      "name": "[198]",
+      "element-type": "198",
       "meta-type": "array"
     },
     {
-      "name": "195",
+      "name": "198",
       "members": [
         {
           "name": "type",
@@ -6924,7 +6991,7 @@
         },
         {
           "name": "props",
-          "type": "445"
+          "type": "448"
         },
         {
           "name": "qom-path",
@@ -6935,40 +7002,40 @@
       "meta-type": "object"
     },
     {
-      "name": "196",
+      "name": "199",
       "tag": "type",
       "variants": [
         {
           "case": "node",
-          "type": "450"
+          "type": "453"
         },
         {
           "case": "dist",
-          "type": "451"
+          "type": "454"
         },
         {
           "case": "cpu",
-          "type": "452"
+          "type": "455"
         },
         {
           "case": "hmat-lb",
-          "type": "453"
+          "type": "456"
         },
         {
           "case": "hmat-cache",
-          "type": "454"
+          "type": "457"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "449"
+          "type": "452"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "197",
+      "name": "200",
       "members": [
         {
           "name": "value",
@@ -6978,7 +7045,7 @@
       "meta-type": "object"
     },
     {
-      "name": "198",
+      "name": "201",
       "members": [
         {
           "name": "actual",
@@ -6988,7 +7055,7 @@
       "meta-type": "object"
     },
     {
-      "name": "199",
+      "name": "202",
       "members": [
         {
           "name": "actual",
@@ -6998,7 +7065,7 @@
       "meta-type": "object"
     },
     {
-      "name": "200",
+      "name": "203",
       "members": [
         {
           "name": "base-memory",
@@ -7013,45 +7080,45 @@
       "meta-type": "object"
     },
     {
-      "name": "[201]",
-      "element-type": "201",
+      "name": "[204]",
+      "element-type": "204",
       "meta-type": "array"
     },
     {
-      "name": "201",
+      "name": "204",
       "tag": "type",
       "variants": [
         {
           "case": "dimm",
-          "type": "456"
+          "type": "459"
         },
         {
           "case": "nvdimm",
-          "type": "456"
+          "type": "459"
         },
         {
           "case": "virtio-pmem",
-          "type": "457"
+          "type": "460"
         },
         {
           "case": "virtio-mem",
-          "type": "458"
+          "type": "461"
         },
         {
           "case": "sgx-epc",
-          "type": "459"
+          "type": "462"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "455"
+          "type": "458"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "202",
+      "name": "205",
       "members": [
         {
           "name": "id",
@@ -7070,7 +7137,7 @@
       "meta-type": "object"
     },
     {
-      "name": "203",
+      "name": "206",
       "members": [
         {
           "name": "device",
@@ -7084,7 +7151,7 @@
       "meta-type": "object"
     },
     {
-      "name": "204",
+      "name": "207",
       "members": [
         {
           "name": "human-readable-text",
@@ -7094,36 +7161,36 @@
       "meta-type": "object"
     },
     {
-      "name": "209",
+      "name": "212",
       "members": [
         {
           "name": "type",
-          "type": "462"
+          "type": "465"
         },
         {
           "name": "model",
-          "type": "460"
+          "type": "463"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "210",
+      "name": "213",
       "members": [
         {
           "name": "model",
-          "type": "460"
+          "type": "463"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[211]",
-      "element-type": "211",
+      "name": "[214]",
+      "element-type": "214",
       "meta-type": "array"
     },
     {
-      "name": "211",
+      "name": "214",
       "members": [
         {
           "name": "name",
@@ -7160,11 +7227,11 @@
       "meta-type": "object"
     },
     {
-      "name": "212",
+      "name": "215",
       "members": [
         {
           "name": "mode",
-          "type": "463"
+          "type": "466"
         },
         {
           "name": "filename",
@@ -7179,7 +7246,7 @@
       "meta-type": "object"
     },
     {
-      "name": "213",
+      "name": "216",
       "members": [
         {
           "name": "icount",
@@ -7189,7 +7256,7 @@
       "meta-type": "object"
     },
     {
-      "name": "214",
+      "name": "217",
       "members": [
         {
           "name": "icount",
@@ -7199,31 +7266,31 @@
       "meta-type": "object"
     },
     {
-      "name": "215",
+      "name": "218",
       "members": [
         {
           "name": "instances",
-          "type": "[216]"
+          "type": "[219]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[216]",
-      "element-type": "216",
+      "name": "[219]",
+      "element-type": "219",
       "meta-type": "array"
     },
     {
-      "name": "216",
+      "name": "219",
       "tag": "type",
       "variants": [
         {
           "case": "block-node",
-          "type": "465"
+          "type": "468"
         },
         {
           "case": "chardev",
-          "type": "466"
+          "type": "469"
         },
         {
           "case": "migration",
@@ -7233,13 +7300,13 @@
       "members": [
         {
           "name": "type",
-          "type": "464"
+          "type": "467"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "217",
+      "name": "220",
       "members": [
         {
           "name": "protocol",
@@ -7263,7 +7330,7 @@
       "meta-type": "object"
     },
     {
-      "name": "218",
+      "name": "221",
       "members": [
         {
           "name": "name",
@@ -7274,12 +7341,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[219]",
-      "element-type": "219",
+      "name": "[222]",
+      "element-type": "222",
       "meta-type": "array"
     },
     {
-      "name": "219",
+      "name": "222",
       "members": [
         {
           "name": "id",
@@ -7309,7 +7376,7 @@
       "meta-type": "object"
     },
     {
-      "name": "220",
+      "name": "223",
       "members": [
         {
           "name": "command-line",
@@ -7324,7 +7391,7 @@
       "meta-type": "object"
     },
     {
-      "name": "221",
+      "name": "224",
       "members": [
         {
           "name": "fdname",
@@ -7334,7 +7401,7 @@
       "meta-type": "object"
     },
     {
-      "name": "222",
+      "name": "225",
       "members": [
         {
           "name": "fdname",
@@ -7344,7 +7411,7 @@
       "meta-type": "object"
     },
     {
-      "name": "223",
+      "name": "226",
       "members": [
         {
           "name": "fdset-id",
@@ -7360,7 +7427,7 @@
       "meta-type": "object"
     },
     {
-      "name": "224",
+      "name": "227",
       "members": [
         {
           "name": "fdset-id",
@@ -7374,7 +7441,7 @@
       "meta-type": "object"
     },
     {
-      "name": "225",
+      "name": "228",
       "members": [
         {
           "name": "fdset-id",
@@ -7389,12 +7456,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[226]",
-      "element-type": "226",
+      "name": "[229]",
+      "element-type": "229",
       "meta-type": "array"
     },
     {
-      "name": "226",
+      "name": "229",
       "members": [
         {
           "name": "fdset-id",
@@ -7402,13 +7469,13 @@
         },
         {
           "name": "fds",
-          "type": "[467]"
+          "type": "[470]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "227",
+      "name": "230",
       "members": [
         {
           "name": "option",
@@ -7419,12 +7486,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[228]",
-      "element-type": "228",
+      "name": "[231]",
+      "element-type": "231",
       "meta-type": "array"
     },
     {
-      "name": "228",
+      "name": "231",
       "members": [
         {
           "name": "option",
@@ -7432,13 +7499,13 @@
         },
         {
           "name": "parameters",
-          "type": "[468]"
+          "type": "[471]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "229",
+      "name": "232",
       "members": [
         {
           "name": "offset",
@@ -7452,7 +7519,7 @@
       "meta-type": "object"
     },
     {
-      "name": "230",
+      "name": "233",
       "members": [
         {
           "name": "vfu-id",
@@ -7474,7 +7541,7 @@
       "meta-type": "object"
     },
     {
-      "name": "231",
+      "name": "234",
       "members": [
         {
           "name": "enabled",
@@ -7498,7 +7565,7 @@
         },
         {
           "name": "state",
-          "type": "469"
+          "type": "472"
         },
         {
           "name": "handle",
@@ -7508,7 +7575,7 @@
       "meta-type": "object"
     },
     {
-      "name": "232",
+      "name": "235",
       "members": [
         {
           "name": "data",
@@ -7518,7 +7585,7 @@
       "meta-type": "object"
     },
     {
-      "name": "233",
+      "name": "236",
       "members": [
         {
           "name": "pdh",
@@ -7544,7 +7611,7 @@
       "meta-type": "object"
     },
     {
-      "name": "234",
+      "name": "237",
       "members": [
         {
           "name": "packet-header",
@@ -7563,7 +7630,7 @@
       "meta-type": "object"
     },
     {
-      "name": "235",
+      "name": "238",
       "members": [
         {
           "name": "mnonce",
@@ -7573,7 +7640,7 @@
       "meta-type": "object"
     },
     {
-      "name": "236",
+      "name": "239",
       "members": [
         {
           "name": "data",
@@ -7583,7 +7650,7 @@
       "meta-type": "object"
     },
     {
-      "name": "239",
+      "name": "242",
       "members": [
         {
           "name": "sgx",
@@ -7610,18 +7677,18 @@
         },
         {
           "name": "sections",
-          "type": "[470]"
+          "type": "[473]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[240]",
-      "element-type": "240",
+      "name": "[243]",
+      "element-type": "243",
       "meta-type": "array"
     },
     {
-      "name": "240",
+      "name": "243",
       "members": [
         {
           "name": "device",
@@ -7634,7 +7701,7 @@
         },
         {
           "name": "slot-type",
-          "type": "471"
+          "type": "474"
         },
         {
           "name": "source",
@@ -7648,22 +7715,22 @@
       "meta-type": "object"
     },
     {
-      "name": "241",
+      "name": "244",
       "members": [
         {
           "name": "info",
-          "type": "240"
+          "type": "243"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[242]",
-      "element-type": "242",
+      "name": "[245]",
+      "element-type": "245",
       "meta-type": "array"
     },
     {
-      "name": "242",
+      "name": "245",
       "members": [
         {
           "name": "bus",
@@ -7671,18 +7738,18 @@
         },
         {
           "name": "devices",
-          "type": "[472]"
+          "type": "[475]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "243",
+      "name": "246",
       "tag": "target",
       "variants": [
         {
           "case": "vcpu",
-          "type": "475"
+          "type": "478"
         },
         {
           "case": "vm",
@@ -7692,27 +7759,27 @@
       "members": [
         {
           "name": "target",
-          "type": "473"
+          "type": "476"
         },
         {
           "name": "providers",
           "default": null,
-          "type": "[474]"
+          "type": "[477]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[244]",
-      "element-type": "244",
+      "name": "[247]",
+      "element-type": "247",
       "meta-type": "array"
     },
     {
-      "name": "244",
+      "name": "247",
       "members": [
         {
           "name": "provider",
-          "type": "476"
+          "type": "479"
         },
         {
           "name": "qom-path",
@@ -7721,41 +7788,41 @@
         },
         {
           "name": "stats",
-          "type": "[477]"
+          "type": "[480]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "245",
+      "name": "248",
       "members": [
         {
           "name": "provider",
           "default": null,
-          "type": "476"
+          "type": "479"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[246]",
-      "element-type": "246",
+      "name": "[249]",
+      "element-type": "249",
       "meta-type": "array"
     },
     {
-      "name": "246",
+      "name": "249",
       "members": [
         {
           "name": "provider",
-          "type": "476"
+          "type": "479"
         },
         {
           "name": "target",
-          "type": "473"
+          "type": "476"
         },
         {
           "name": "stats",
-          "type": "[478]"
+          "type": "[481]"
         }
       ],
       "meta-type": "object"
@@ -7766,7 +7833,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "247",
+      "name": "250",
       "members": [
         {
           "name": "debug"
@@ -7838,7 +7905,7 @@
       ]
     },
     {
-      "name": "248",
+      "name": "251",
       "members": [
         {
           "name": "none"
@@ -7886,7 +7953,7 @@
       ]
     },
     {
-      "name": "249",
+      "name": "252",
       "members": [
         {
           "name": "reset"
@@ -7922,7 +7989,7 @@
       ]
     },
     {
-      "name": "250",
+      "name": "253",
       "members": [
         {
           "name": "reset"
@@ -7938,7 +8005,7 @@
       ]
     },
     {
-      "name": "251",
+      "name": "254",
       "members": [
         {
           "name": "poweroff"
@@ -7954,7 +8021,7 @@
       ]
     },
     {
-      "name": "252",
+      "name": "255",
       "members": [
         {
           "name": "pause"
@@ -7974,7 +8041,7 @@
       ]
     },
     {
-      "name": "253",
+      "name": "256",
       "members": [
         {
           "name": "pause"
@@ -7994,28 +8061,28 @@
       ]
     },
     {
-      "name": "254",
+      "name": "257",
       "tag": "type",
       "variants": [
         {
           "case": "hyper-v",
-          "type": "480"
+          "type": "483"
         },
         {
           "case": "s390",
-          "type": "481"
+          "type": "484"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "479"
+          "type": "482"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "255",
+      "name": "258",
       "members": [
         {
           "name": "hypervisor"
@@ -8031,7 +8098,7 @@
       ]
     },
     {
-      "name": "256",
+      "name": "259",
       "members": [
         {
           "name": "ignore"
@@ -8055,7 +8122,7 @@
       ]
     },
     {
-      "name": "257",
+      "name": "260",
       "members": [
         {
           "name": "action-required",
@@ -8069,7 +8136,7 @@
       "meta-type": "object"
     },
     {
-      "name": "258",
+      "name": "261",
       "members": [
         {
           "name": "retain"
@@ -8099,7 +8166,7 @@
       "meta-type": "array"
     },
     {
-      "name": "259",
+      "name": "262",
       "members": [
         {
           "name": "ok"
@@ -8119,7 +8186,7 @@
       ]
     },
     {
-      "name": "260",
+      "name": "263",
       "members": [
         {
           "name": "rd_bytes",
@@ -8228,41 +8295,41 @@
         },
         {
           "name": "timed_stats",
-          "type": "[482]"
+          "type": "[485]"
         },
         {
           "name": "rd_latency_histogram",
           "default": null,
-          "type": "483"
+          "type": "486"
         },
         {
           "name": "wr_latency_histogram",
           "default": null,
-          "type": "483"
+          "type": "486"
         },
         {
           "name": "flush_latency_histogram",
           "default": null,
-          "type": "483"
+          "type": "486"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "261",
+      "name": "264",
       "tag": "driver",
       "variants": [
         {
           "case": "file",
-          "type": "484"
+          "type": "487"
         },
         {
           "case": "host_device",
-          "type": "484"
+          "type": "487"
         },
         {
           "case": "nvme",
-          "type": "485"
+          "type": "488"
         },
         {
           "case": "blkdebug",
@@ -8424,13 +8491,13 @@
       "members": [
         {
           "name": "driver",
-          "type": "276"
+          "type": "279"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "262",
+      "name": "265",
       "members": [
         {
           "name": "undefined"
@@ -8482,7 +8549,7 @@
       ]
     },
     {
-      "name": "263",
+      "name": "266",
       "members": [
         {
           "name": "existing"
@@ -8498,7 +8565,7 @@
       ]
     },
     {
-      "name": "264",
+      "name": "267",
       "members": [
         {
           "name": "report"
@@ -8526,7 +8593,7 @@
       ]
     },
     {
-      "name": "265",
+      "name": "268",
       "members": [
         {
           "name": "top"
@@ -8554,7 +8621,7 @@
       ]
     },
     {
-      "name": "266",
+      "name": "269",
       "members": [
         {
           "name": "on-success"
@@ -8574,7 +8641,7 @@
       ]
     },
     {
-      "name": "267",
+      "name": "270",
       "members": [
         {
           "name": "use-copy-range",
@@ -8595,7 +8662,7 @@
       "meta-type": "object"
     },
     {
-      "name": "268",
+      "name": "271",
       "members": [
         {
           "name": "off"
@@ -8615,7 +8682,7 @@
       ]
     },
     {
-      "name": "269",
+      "name": "272",
       "members": [
         {
           "name": "filename",
@@ -8677,18 +8744,18 @@
         {
           "name": "backing-image",
           "default": null,
-          "type": "269"
+          "type": "272"
         },
         {
           "name": "format-specific",
           "default": null,
-          "type": "486"
+          "type": "489"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "270",
+      "name": "273",
       "members": [
         {
           "name": "writeback",
@@ -8706,12 +8773,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[271]",
-      "element-type": "271",
+      "name": "[274]",
+      "element-type": "274",
       "meta-type": "array"
     },
     {
-      "name": "271",
+      "name": "274",
       "members": [
         {
           "name": "name",
@@ -8747,12 +8814,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[272]",
-      "element-type": "272",
+      "name": "[275]",
+      "element-type": "275",
       "meta-type": "array"
     },
     {
-      "name": "272",
+      "name": "275",
       "members": [
         {
           "name": "id",
@@ -8760,7 +8827,7 @@
         },
         {
           "name": "type",
-          "type": "487"
+          "type": "490"
         },
         {
           "name": "name",
@@ -8770,12 +8837,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[273]",
-      "element-type": "273",
+      "name": "[276]",
+      "element-type": "276",
       "meta-type": "array"
     },
     {
-      "name": "273",
+      "name": "276",
       "members": [
         {
           "name": "parent",
@@ -8791,17 +8858,17 @@
         },
         {
           "name": "perm",
-          "type": "[488]"
+          "type": "[491]"
         },
         {
           "name": "shared-perm",
-          "type": "[488]"
+          "type": "[491]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "274",
+      "name": "277",
       "members": [
         {
           "name": "background"
@@ -8817,12 +8884,12 @@
       ]
     },
     {
-      "name": "[275]",
-      "element-type": "275",
+      "name": "[278]",
+      "element-type": "278",
       "meta-type": "array"
     },
     {
-      "name": "275",
+      "name": "278",
       "members": [
         {
           "type": "str"
@@ -8834,7 +8901,7 @@
       "meta-type": "alternate"
     },
     {
-      "name": "276",
+      "name": "279",
       "members": [
         {
           "name": "blkdebug"
@@ -9010,7 +9077,7 @@
       ]
     },
     {
-      "name": "277",
+      "name": "280",
       "members": [
         {
           "name": "ignore"
@@ -9026,7 +9093,7 @@
       ]
     },
     {
-      "name": "278",
+      "name": "281",
       "members": [
         {
           "name": "direct",
@@ -9042,11 +9109,11 @@
       "meta-type": "object"
     },
     {
-      "name": "279",
+      "name": "282",
       "members": [
         {
           "name": "image",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "config",
@@ -9086,36 +9153,36 @@
         {
           "name": "inject-error",
           "default": null,
-          "type": "[490]"
+          "type": "[493]"
         },
         {
           "name": "set-state",
           "default": null,
-          "type": "[491]"
+          "type": "[494]"
         },
         {
           "name": "take-child-perms",
           "default": null,
-          "type": "[488]"
+          "type": "[491]"
         },
         {
           "name": "unshare-child-perms",
           "default": null,
-          "type": "[488]"
+          "type": "[491]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "280",
+      "name": "283",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "log",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "log-sector-size",
@@ -9136,64 +9203,74 @@
       "meta-type": "object"
     },
     {
-      "name": "281",
+      "name": "284",
       "members": [
         {
           "name": "test",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "raw",
-          "type": "489"
+          "type": "492"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "282",
+      "name": "285",
       "members": [
         {
           "name": "image",
-          "type": "489"
+          "type": "492"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "283",
+      "name": "286",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "284",
+      "name": "287",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "target",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "bitmap",
           "default": null,
           "type": "37"
+        },
+        {
+          "name": "on-cbw-error",
+          "default": null,
+          "type": "495"
+        },
+        {
+          "name": "cbw-timeout",
+          "default": null,
+          "type": "int"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "285",
+      "name": "288",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "bottom",
@@ -9204,7 +9281,7 @@
       "meta-type": "object"
     },
     {
-      "name": "286",
+      "name": "289",
       "members": [
         {
           "name": "filename",
@@ -9218,12 +9295,12 @@
         {
           "name": "locking",
           "default": null,
-          "type": "492"
+          "type": "496"
         },
         {
           "name": "aio",
           "default": null,
-          "type": "493"
+          "type": "497"
         },
         {
           "name": "aio-max-batch",
@@ -9250,7 +9327,7 @@
       ]
     },
     {
-      "name": "287",
+      "name": "290",
       "members": [
         {
           "name": "url",
@@ -9290,7 +9367,7 @@
       "meta-type": "object"
     },
     {
-      "name": "288",
+      "name": "291",
       "members": [
         {
           "name": "url",
@@ -9335,7 +9412,7 @@
       "meta-type": "object"
     },
     {
-      "name": "289",
+      "name": "292",
       "members": [
         {
           "name": "volume",
@@ -9347,7 +9424,7 @@
         },
         {
           "name": "server",
-          "type": "[384]"
+          "type": "[387]"
         },
         {
           "name": "debug",
@@ -9363,7 +9440,7 @@
       "meta-type": "object"
     },
     {
-      "name": "290",
+      "name": "293",
       "members": [
         {
           "name": "url",
@@ -9413,7 +9490,7 @@
       "meta-type": "object"
     },
     {
-      "name": "291",
+      "name": "294",
       "members": [
         {
           "name": "url",
@@ -9468,11 +9545,11 @@
       "meta-type": "object"
     },
     {
-      "name": "292",
+      "name": "295",
       "members": [
         {
           "name": "transport",
-          "type": "494"
+          "type": "498"
         },
         {
           "name": "portal",
@@ -9505,7 +9582,7 @@
         {
           "name": "header-digest",
           "default": null,
-          "type": "495"
+          "type": "499"
         },
         {
           "name": "timeout",
@@ -9516,11 +9593,11 @@
       "meta-type": "object"
     },
     {
-      "name": "293",
+      "name": "296",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "key-secret",
@@ -9531,11 +9608,11 @@
       "meta-type": "object"
     },
     {
-      "name": "294",
+      "name": "297",
       "members": [
         {
           "name": "server",
-          "type": "384"
+          "type": "387"
         },
         {
           "name": "export",
@@ -9574,11 +9651,11 @@
       "meta-type": "object"
     },
     {
-      "name": "295",
+      "name": "298",
       "members": [
         {
           "name": "server",
-          "type": "496"
+          "type": "500"
         },
         {
           "name": "path",
@@ -9618,7 +9695,7 @@
       "meta-type": "object"
     },
     {
-      "name": "296",
+      "name": "299",
       "members": [
         {
           "name": "size",
@@ -9639,7 +9716,7 @@
       "meta-type": "object"
     },
     {
-      "name": "297",
+      "name": "300",
       "members": [
         {
           "name": "device",
@@ -9653,11 +9730,11 @@
       "meta-type": "object"
     },
     {
-      "name": "298",
+      "name": "301",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "prealloc-align",
@@ -9673,16 +9750,16 @@
       "meta-type": "object"
     },
     {
-      "name": "299",
+      "name": "302",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "497"
+          "type": "501"
         },
         {
           "name": "lazy-refcounts",
@@ -9707,7 +9784,7 @@
         {
           "name": "overlap-check",
           "default": null,
-          "type": "498"
+          "type": "502"
         },
         {
           "name": "cache-size",
@@ -9737,53 +9814,53 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "499"
+          "type": "503"
         },
         {
           "name": "data-file",
           "default": null,
-          "type": "489"
+          "type": "492"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "300",
+      "name": "303",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "497"
+          "type": "501"
         },
         {
           "name": "encrypt",
           "default": null,
-          "type": "500"
+          "type": "504"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "301",
+      "name": "304",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "backing",
           "default": null,
-          "type": "497"
+          "type": "501"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "302",
+      "name": "305",
       "members": [
         {
           "name": "blkverify",
@@ -9792,7 +9869,7 @@
         },
         {
           "name": "children",
-          "type": "[489]"
+          "type": "[492]"
         },
         {
           "name": "vote-threshold",
@@ -9806,17 +9883,17 @@
         {
           "name": "read-pattern",
           "default": null,
-          "type": "501"
+          "type": "505"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "303",
+      "name": "306",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "offset",
@@ -9832,7 +9909,7 @@
       "meta-type": "object"
     },
     {
-      "name": "304",
+      "name": "307",
       "members": [
         {
           "name": "pool",
@@ -9860,7 +9937,7 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "502"
+          "type": "506"
         },
         {
           "name": "user",
@@ -9870,7 +9947,7 @@
         {
           "name": "auth-client-required",
           "default": null,
-          "type": "[503]"
+          "type": "[507]"
         },
         {
           "name": "key-secret",
@@ -9880,21 +9957,21 @@
         {
           "name": "server",
           "default": null,
-          "type": "[504]"
+          "type": "[508]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "305",
+      "name": "308",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "mode",
-          "type": "505"
+          "type": "509"
         },
         {
           "name": "top-id",
@@ -9905,11 +9982,11 @@
       "meta-type": "object"
     },
     {
-      "name": "306",
+      "name": "309",
       "members": [
         {
           "name": "server",
-          "type": "506"
+          "type": "510"
         },
         {
           "name": "path",
@@ -9923,13 +10000,13 @@
         {
           "name": "host-key-check",
           "default": null,
-          "type": "507"
+          "type": "511"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "307",
+      "name": "310",
       "members": [
         {
           "name": "throttle-group",
@@ -9937,13 +10014,13 @@
         },
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "308",
+      "name": "311",
       "members": [
         {
           "name": "dir",
@@ -9978,64 +10055,64 @@
       "meta-type": "array"
     },
     {
-      "name": "309",
+      "name": "312",
       "tag": "driver",
       "variants": [
         {
           "case": "file",
-          "type": "508"
+          "type": "512"
         },
         {
           "case": "gluster",
-          "type": "509"
+          "type": "513"
         },
         {
           "case": "luks",
-          "type": "510"
+          "type": "514"
         },
         {
           "case": "nfs",
-          "type": "511"
+          "type": "515"
         },
         {
           "case": "parallels",
-          "type": "512"
+          "type": "516"
         },
         {
           "case": "qcow",
-          "type": "513"
+          "type": "517"
         },
         {
           "case": "qcow2",
-          "type": "514"
+          "type": "518"
         },
         {
           "case": "qed",
-          "type": "515"
+          "type": "519"
         },
         {
           "case": "rbd",
-          "type": "516"
+          "type": "520"
         },
         {
           "case": "ssh",
-          "type": "517"
+          "type": "521"
         },
         {
           "case": "vdi",
-          "type": "518"
+          "type": "522"
         },
         {
           "case": "vhdx",
-          "type": "519"
+          "type": "523"
         },
         {
           "case": "vmdk",
-          "type": "520"
+          "type": "524"
         },
         {
           "case": "vpc",
-          "type": "521"
+          "type": "525"
         },
         {
           "case": "blkdebug",
@@ -10153,22 +10230,22 @@
       "members": [
         {
           "name": "driver",
-          "type": "276"
+          "type": "279"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "310",
+      "name": "313",
       "tag": "driver",
       "variants": [
         {
           "case": "luks",
-          "type": "522"
+          "type": "526"
         },
         {
           "case": "qcow2",
-          "type": "523"
+          "type": "527"
         },
         {
           "case": "blkdebug",
@@ -10334,13 +10411,13 @@
       "members": [
         {
           "name": "driver",
-          "type": "276"
+          "type": "279"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "311",
+      "name": "314",
       "members": [
         {
           "name": "read"
@@ -10356,7 +10433,7 @@
       ]
     },
     {
-      "name": "312",
+      "name": "315",
       "members": [
         {
           "name": "ignore"
@@ -10376,7 +10453,7 @@
       ]
     },
     {
-      "name": "313",
+      "name": "316",
       "members": [
         {
           "name": "commit"
@@ -10420,7 +10497,7 @@
       ]
     },
     {
-      "name": "314",
+      "name": "317",
       "members": [
         {
           "type": "str"
@@ -10432,7 +10509,7 @@
       "meta-type": "alternate"
     },
     {
-      "name": "315",
+      "name": "318",
       "members": [
         {
           "name": "read"
@@ -10452,36 +10529,36 @@
       ]
     },
     {
-      "name": "316",
+      "name": "319",
       "tag": "type",
       "variants": [
         {
           "case": "inet",
-          "type": "525"
+          "type": "529"
         },
         {
           "case": "unix",
-          "type": "526"
+          "type": "530"
         },
         {
           "case": "vsock",
-          "type": "527"
+          "type": "531"
         },
         {
           "case": "fd",
-          "type": "528"
+          "type": "532"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "524"
+          "type": "528"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "317",
+      "name": "320",
       "members": [
         {
           "name": "safe"
@@ -10497,7 +10574,7 @@
       ]
     },
     {
-      "name": "318",
+      "name": "321",
       "members": [
         {
           "name": "nbd"
@@ -10521,7 +10598,7 @@
       ]
     },
     {
-      "name": "319",
+      "name": "322",
       "members": [
         {
           "name": "name",
@@ -10536,7 +10613,7 @@
         {
           "name": "bitmaps",
           "default": null,
-          "type": "[275]"
+          "type": "[278]"
         },
         {
           "name": "allocation-depth",
@@ -10547,11 +10624,11 @@
       "meta-type": "object"
     },
     {
-      "name": "320",
+      "name": "323",
       "members": [
         {
           "name": "addr",
-          "type": "384"
+          "type": "387"
         },
         {
           "name": "logical-block-size",
@@ -10567,7 +10644,7 @@
       "meta-type": "object"
     },
     {
-      "name": "321",
+      "name": "324",
       "members": [
         {
           "name": "mountpoint",
@@ -10581,13 +10658,13 @@
         {
           "name": "allow-other",
           "default": null,
-          "type": "529"
+          "type": "533"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "322",
+      "name": "325",
       "members": [
         {
           "name": "name",
@@ -10617,7 +10694,7 @@
       "meta-type": "object"
     },
     {
-      "name": "323",
+      "name": "326",
       "members": [
         {
           "name": "utf8"
@@ -10633,108 +10710,108 @@
       ]
     },
     {
-      "name": "324",
+      "name": "327",
       "tag": "type",
       "variants": [
         {
           "case": "file",
-          "type": "531"
+          "type": "535"
         },
         {
           "case": "serial",
-          "type": "532"
+          "type": "536"
         },
         {
           "case": "parallel",
-          "type": "532"
+          "type": "536"
         },
         {
           "case": "pipe",
-          "type": "532"
+          "type": "536"
         },
         {
           "case": "socket",
-          "type": "533"
+          "type": "537"
         },
         {
           "case": "udp",
-          "type": "534"
+          "type": "538"
         },
         {
           "case": "pty",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "null",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "mux",
-          "type": "536"
+          "type": "540"
         },
         {
           "case": "msmouse",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "wctablet",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "braille",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "testdev",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "stdio",
-          "type": "537"
+          "type": "541"
         },
         {
           "case": "console",
-          "type": "535"
+          "type": "539"
         },
         {
           "case": "spicevmc",
-          "type": "538"
+          "type": "542"
         },
         {
           "case": "spiceport",
-          "type": "539"
+          "type": "543"
         },
         {
           "case": "qemu-vdagent",
-          "type": "540"
+          "type": "544"
         },
         {
           "case": "dbus",
-          "type": "541"
+          "type": "545"
         },
         {
           "case": "vc",
-          "type": "542"
+          "type": "546"
         },
         {
           "case": "ringbuf",
-          "type": "543"
+          "type": "547"
         },
         {
           "case": "memory",
-          "type": "543"
+          "type": "547"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "530"
+          "type": "534"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "325",
+      "name": "328",
       "members": [
         {
           "name": "elf"
@@ -10762,7 +10839,7 @@
       ]
     },
     {
-      "name": "326",
+      "name": "329",
       "members": [
         {
           "name": "none"
@@ -10786,12 +10863,12 @@
       ]
     },
     {
-      "name": "[325]",
-      "element-type": "325",
+      "name": "[328]",
+      "element-type": "328",
       "meta-type": "array"
     },
     {
-      "name": "327",
+      "name": "330",
       "members": [
         {
           "name": "none"
@@ -10847,7 +10924,7 @@
       ]
     },
     {
-      "name": "328",
+      "name": "331",
       "members": [
         {
           "name": "netdev",
@@ -10878,7 +10955,7 @@
       "meta-type": "object"
     },
     {
-      "name": "329",
+      "name": "332",
       "members": [
         {
           "name": "hostname",
@@ -10938,7 +11015,7 @@
         {
           "name": "dnssearch",
           "default": null,
-          "type": "[544]"
+          "type": "[548]"
         },
         {
           "name": "domainname",
@@ -10978,12 +11055,12 @@
         {
           "name": "hostfwd",
           "default": null,
-          "type": "[544]"
+          "type": "[548]"
         },
         {
           "name": "guestfwd",
           "default": null,
-          "type": "[544]"
+          "type": "[548]"
         },
         {
           "name": "tftp-server-name",
@@ -10994,7 +11071,7 @@
       "meta-type": "object"
     },
     {
-      "name": "330",
+      "name": "333",
       "members": [
         {
           "name": "ifname",
@@ -11075,7 +11152,7 @@
       "meta-type": "object"
     },
     {
-      "name": "331",
+      "name": "334",
       "members": [
         {
           "name": "src",
@@ -11148,7 +11225,7 @@
       "meta-type": "object"
     },
     {
-      "name": "332",
+      "name": "335",
       "members": [
         {
           "name": "fd",
@@ -11184,7 +11261,7 @@
       "meta-type": "object"
     },
     {
-      "name": "333",
+      "name": "336",
       "members": [
         {
           "name": "sock",
@@ -11210,7 +11287,7 @@
       "meta-type": "object"
     },
     {
-      "name": "334",
+      "name": "337",
       "members": [
         {
           "name": "br",
@@ -11226,7 +11303,7 @@
       "meta-type": "object"
     },
     {
-      "name": "335",
+      "name": "338",
       "members": [
         {
           "name": "hubid",
@@ -11241,7 +11318,7 @@
       "meta-type": "object"
     },
     {
-      "name": "336",
+      "name": "339",
       "members": [
         {
           "name": "ifname",
@@ -11256,7 +11333,7 @@
       "meta-type": "object"
     },
     {
-      "name": "337",
+      "name": "340",
       "members": [
         {
           "name": "chardev",
@@ -11276,7 +11353,7 @@
       "meta-type": "object"
     },
     {
-      "name": "338",
+      "name": "341",
       "members": [
         {
           "name": "vhostdev",
@@ -11287,12 +11364,20 @@
           "name": "queues",
           "default": null,
           "type": "int"
+        },
+        {
+          "name": "x-svq",
+          "default": null,
+          "type": "bool",
+          "features": [
+            "unstable"
+          ]
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "342",
+      "name": "345",
       "members": [
         {
           "name": "normal"
@@ -11317,7 +11402,7 @@
       "meta-type": "array"
     },
     {
-      "name": "343",
+      "name": "346",
       "members": [
         {
           "name": "half"
@@ -11333,7 +11418,7 @@
       ]
     },
     {
-      "name": "344",
+      "name": "347",
       "members": [
         {
           "name": "off"
@@ -11349,7 +11434,7 @@
       ]
     },
     {
-      "name": "345",
+      "name": "348",
       "members": [
         {
           "name": "priority",
@@ -11408,7 +11493,7 @@
       "meta-type": "object"
     },
     {
-      "name": "346",
+      "name": "349",
       "members": [
         {
           "name": "in-pport",
@@ -11449,7 +11534,7 @@
       "meta-type": "object"
     },
     {
-      "name": "347",
+      "name": "350",
       "members": [
         {
           "name": "goto-tbl",
@@ -11485,16 +11570,16 @@
       "meta-type": "object"
     },
     {
-      "name": "348",
+      "name": "351",
       "tag": "type",
       "variants": [
         {
           "case": "passthrough",
-          "type": "545"
+          "type": "549"
         },
         {
           "case": "emulator",
-          "type": "546"
+          "type": "550"
         }
       ],
       "members": [
@@ -11506,7 +11591,7 @@
       "meta-type": "object"
     },
     {
-      "name": "349",
+      "name": "352",
       "members": [
         {
           "name": "vnc"
@@ -11522,7 +11607,7 @@
       ]
     },
     {
-      "name": "350",
+      "name": "353",
       "members": [
         {
           "name": "keep"
@@ -11542,7 +11627,7 @@
       ]
     },
     {
-      "name": "351",
+      "name": "354",
       "members": [
         {
           "name": "display",
@@ -11553,7 +11638,7 @@
       "meta-type": "object"
     },
     {
-      "name": "352",
+      "name": "355",
       "members": [
         {
           "name": "display",
@@ -11564,7 +11649,7 @@
       "meta-type": "object"
     },
     {
-      "name": "353",
+      "name": "356",
       "members": [
         {
           "name": "ppm"
@@ -11580,7 +11665,7 @@
       ]
     },
     {
-      "name": "354",
+      "name": "357",
       "members": [
         {
           "name": "client"
@@ -11600,12 +11685,12 @@
       ]
     },
     {
-      "name": "[355]",
-      "element-type": "355",
+      "name": "[358]",
+      "element-type": "358",
       "meta-type": "array"
     },
     {
-      "name": "355",
+      "name": "358",
       "members": [
         {
           "name": "host",
@@ -11617,7 +11702,7 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "connection-id",
@@ -11639,7 +11724,7 @@
       "meta-type": "object"
     },
     {
-      "name": "356",
+      "name": "359",
       "members": [
         {
           "name": "host",
@@ -11651,13 +11736,13 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "357",
+      "name": "360",
       "members": [
         {
           "name": "host",
@@ -11669,7 +11754,7 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "auth",
@@ -11680,7 +11765,7 @@
       "meta-type": "object"
     },
     {
-      "name": "358",
+      "name": "361",
       "members": [
         {
           "name": "ipv4"
@@ -11708,12 +11793,12 @@
       ]
     },
     {
-      "name": "[359]",
-      "element-type": "359",
+      "name": "[362]",
+      "element-type": "362",
       "meta-type": "array"
     },
     {
-      "name": "359",
+      "name": "362",
       "members": [
         {
           "name": "host",
@@ -11725,7 +11810,7 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "websocket",
@@ -11745,12 +11830,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[360]",
-      "element-type": "360",
+      "name": "[363]",
+      "element-type": "363",
       "meta-type": "array"
     },
     {
-      "name": "360",
+      "name": "363",
       "members": [
         {
           "name": "host",
@@ -11762,7 +11847,7 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "websocket",
@@ -11770,18 +11855,18 @@
         },
         {
           "name": "auth",
-          "type": "361"
+          "type": "364"
         },
         {
           "name": "vencrypt",
           "default": null,
-          "type": "362"
+          "type": "365"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "361",
+      "name": "364",
       "members": [
         {
           "name": "none"
@@ -11825,7 +11910,7 @@
       ]
     },
     {
-      "name": "362",
+      "name": "365",
       "members": [
         {
           "name": "plain"
@@ -11869,7 +11954,7 @@
       ]
     },
     {
-      "name": "363",
+      "name": "366",
       "members": [
         {
           "name": "host",
@@ -11881,7 +11966,7 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "websocket",
@@ -11896,7 +11981,7 @@
       "meta-type": "object"
     },
     {
-      "name": "364",
+      "name": "367",
       "members": [
         {
           "name": "host",
@@ -11908,7 +11993,7 @@
         },
         {
           "name": "family",
-          "type": "358"
+          "type": "361"
         },
         {
           "name": "websocket",
@@ -11918,67 +12003,67 @@
       "meta-type": "object"
     },
     {
-      "name": "[365]",
-      "element-type": "365",
+      "name": "[368]",
+      "element-type": "368",
       "meta-type": "array"
     },
     {
-      "name": "365",
+      "name": "368",
       "tag": "type",
       "variants": [
         {
           "case": "number",
-          "type": "548"
+          "type": "552"
         },
         {
           "case": "qcode",
-          "type": "549"
+          "type": "553"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "547"
+          "type": "551"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[366]",
-      "element-type": "366",
+      "name": "[369]",
+      "element-type": "369",
       "meta-type": "array"
     },
     {
-      "name": "366",
+      "name": "369",
       "tag": "type",
       "variants": [
         {
           "case": "key",
-          "type": "551"
+          "type": "555"
         },
         {
           "case": "btn",
-          "type": "552"
+          "type": "556"
         },
         {
           "case": "rel",
-          "type": "553"
+          "type": "557"
         },
         {
           "case": "abs",
-          "type": "553"
+          "type": "557"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "550"
+          "type": "554"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "367",
+      "name": "370",
       "members": [
         {
           "name": "default"
@@ -12014,7 +12099,7 @@
       ]
     },
     {
-      "name": "368",
+      "name": "371",
       "members": [
         {
           "name": "off"
@@ -12038,7 +12123,7 @@
       ]
     },
     {
-      "name": "369",
+      "name": "372",
       "members": [
         {
           "name": "grab-on-hover",
@@ -12049,12 +12134,17 @@
           "name": "zoom-to-fit",
           "default": null,
           "type": "bool"
+        },
+        {
+          "name": "show-tabs",
+          "default": null,
+          "type": "bool"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "370",
+      "name": "373",
       "members": [
         {
           "name": "left-command-key",
@@ -12075,7 +12165,7 @@
       "meta-type": "object"
     },
     {
-      "name": "371",
+      "name": "374",
       "members": [
         {
           "name": "charset",
@@ -12086,7 +12176,7 @@
       "meta-type": "object"
     },
     {
-      "name": "372",
+      "name": "375",
       "members": [
         {
           "name": "rendernode",
@@ -12097,7 +12187,7 @@
       "meta-type": "object"
     },
     {
-      "name": "373",
+      "name": "376",
       "members": [
         {
           "name": "rendernode",
@@ -12123,18 +12213,18 @@
       "meta-type": "object"
     },
     {
-      "name": "374",
+      "name": "377",
       "members": [
         {
           "name": "grab-mod",
           "default": null,
-          "type": "554"
+          "type": "558"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "375",
+      "name": "378",
       "members": [
         {
           "name": "vnc"
@@ -12146,7 +12236,7 @@
       ]
     },
     {
-      "name": "376",
+      "name": "379",
       "members": [
         {
           "name": "tls-certs",
@@ -12157,7 +12247,7 @@
       "meta-type": "object"
     },
     {
-      "name": "377",
+      "name": "380",
       "members": [
         {
           "name": "vnc"
@@ -12169,18 +12259,18 @@
       ]
     },
     {
-      "name": "378",
+      "name": "381",
       "members": [
         {
           "name": "addresses",
           "default": null,
-          "type": "[384]"
+          "type": "[387]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "379",
+      "name": "382",
       "members": [
         {
           "name": "none"
@@ -12244,7 +12334,7 @@
       ]
     },
     {
-      "name": "380",
+      "name": "383",
       "members": [
         {
           "name": "transferred",
@@ -12313,12 +12403,16 @@
         {
           "name": "postcopy-bytes",
           "type": "int"
+        },
+        {
+          "name": "dirty-sync-missed-zero-copy",
+          "type": "int"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "381",
+      "name": "384",
       "members": [
         {
           "name": "transferred",
@@ -12328,7 +12422,7 @@
       "meta-type": "object"
     },
     {
-      "name": "382",
+      "name": "385",
       "members": [
         {
           "name": "cache-size",
@@ -12362,7 +12456,7 @@
       "meta-type": "object"
     },
     {
-      "name": "383",
+      "name": "386",
       "members": [
         {
           "name": "pages",
@@ -12388,41 +12482,41 @@
       "meta-type": "object"
     },
     {
-      "name": "[384]",
-      "element-type": "384",
+      "name": "[387]",
+      "element-type": "387",
       "meta-type": "array"
     },
     {
-      "name": "384",
+      "name": "387",
       "tag": "type",
       "variants": [
         {
           "case": "inet",
-          "type": "506"
+          "type": "510"
         },
         {
           "case": "unix",
-          "type": "555"
+          "type": "559"
         },
         {
           "case": "vsock",
-          "type": "556"
+          "type": "560"
         },
         {
           "case": "fd",
-          "type": "544"
+          "type": "548"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "524"
+          "type": "528"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "385",
+      "name": "388",
       "members": [
         {
           "name": "xbzrle"
@@ -12489,6 +12583,9 @@
         },
         {
           "name": "zero-copy-send"
+        },
+        {
+          "name": "postcopy-preempt"
         }
       ],
       "meta-type": "enum",
@@ -12512,11 +12609,12 @@
         "x-ignore-shared",
         "validate-uuid",
         "background-snapshot",
-        "zero-copy-send"
+        "zero-copy-send",
+        "postcopy-preempt"
       ]
     },
     {
-      "name": "386",
+      "name": "389",
       "members": [
         {
           "name": "none"
@@ -12536,12 +12634,12 @@
       ]
     },
     {
-      "name": "[387]",
-      "element-type": "387",
+      "name": "[390]",
+      "element-type": "390",
       "meta-type": "array"
     },
     {
-      "name": "387",
+      "name": "390",
       "members": [
         {
           "name": "node-name",
@@ -12553,13 +12651,13 @@
         },
         {
           "name": "bitmaps",
-          "type": "[557]"
+          "type": "[561]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "388",
+      "name": "391",
       "members": [
         {
           "name": "none"
@@ -12579,7 +12677,7 @@
       ]
     },
     {
-      "name": "389",
+      "name": "392",
       "members": [
         {
           "name": "none"
@@ -12603,7 +12701,7 @@
       ]
     },
     {
-      "name": "390",
+      "name": "393",
       "members": [
         {
           "name": "page-sampling"
@@ -12623,7 +12721,7 @@
       ]
     },
     {
-      "name": "391",
+      "name": "394",
       "members": [
         {
           "name": "unstarted"
@@ -12643,12 +12741,12 @@
       ]
     },
     {
-      "name": "[392]",
-      "element-type": "392",
+      "name": "[395]",
+      "element-type": "395",
       "meta-type": "array"
     },
     {
-      "name": "392",
+      "name": "395",
       "members": [
         {
           "name": "id",
@@ -12662,84 +12760,84 @@
       "meta-type": "object"
     },
     {
-      "name": "[393]",
-      "element-type": "393",
+      "name": "[396]",
+      "element-type": "396",
       "meta-type": "array"
     },
     {
-      "name": "393",
+      "name": "396",
       "tag": "type",
       "variants": [
         {
           "case": "abort",
-          "type": "559"
+          "type": "563"
         },
         {
           "case": "block-dirty-bitmap-add",
-          "type": "560"
+          "type": "564"
         },
         {
           "case": "block-dirty-bitmap-remove",
-          "type": "561"
+          "type": "565"
         },
         {
           "case": "block-dirty-bitmap-clear",
-          "type": "561"
+          "type": "565"
         },
         {
           "case": "block-dirty-bitmap-enable",
-          "type": "561"
+          "type": "565"
         },
         {
           "case": "block-dirty-bitmap-disable",
-          "type": "561"
+          "type": "565"
         },
         {
           "case": "block-dirty-bitmap-merge",
-          "type": "562"
+          "type": "566"
         },
         {
           "case": "blockdev-backup",
-          "type": "563"
+          "type": "567"
         },
         {
           "case": "blockdev-snapshot",
-          "type": "564"
+          "type": "568"
         },
         {
           "case": "blockdev-snapshot-internal-sync",
-          "type": "565"
+          "type": "569"
         },
         {
           "case": "blockdev-snapshot-sync",
-          "type": "566"
+          "type": "570"
         },
         {
           "case": "drive-backup",
-          "type": "567"
+          "type": "571"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "558"
+          "type": "562"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "394",
+      "name": "397",
       "members": [
         {
           "name": "completion-mode",
           "default": null,
-          "type": "568"
+          "type": "572"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "395",
+      "name": "398",
       "members": [
         {
           "name": "unavailable"
@@ -12759,12 +12857,12 @@
       ]
     },
     {
-      "name": "[396]",
-      "element-type": "396",
+      "name": "[399]",
+      "element-type": "399",
       "meta-type": "array"
     },
     {
-      "name": "396",
+      "name": "399",
       "members": [
         {
           "name": "oob"
@@ -12776,7 +12874,7 @@
       ]
     },
     {
-      "name": "397",
+      "name": "400",
       "members": [
         {
           "name": "major",
@@ -12794,7 +12892,7 @@
       "meta-type": "object"
     },
     {
-      "name": "398",
+      "name": "401",
       "members": [
         {
           "name": "builtin"
@@ -12830,21 +12928,21 @@
       ]
     },
     {
-      "name": "399",
+      "name": "402",
       "members": [
         {
           "name": "json-type",
-          "type": "569"
+          "type": "573"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "400",
+      "name": "403",
       "members": [
         {
           "name": "members",
-          "type": "[570]"
+          "type": "[574]"
         },
         {
           "name": "values",
@@ -12857,7 +12955,7 @@
       "meta-type": "object"
     },
     {
-      "name": "401",
+      "name": "404",
       "members": [
         {
           "name": "element-type",
@@ -12867,11 +12965,11 @@
       "meta-type": "object"
     },
     {
-      "name": "402",
+      "name": "405",
       "members": [
         {
           "name": "members",
-          "type": "[571]"
+          "type": "[575]"
         },
         {
           "name": "tag",
@@ -12881,23 +12979,23 @@
         {
           "name": "variants",
           "default": null,
-          "type": "[572]"
+          "type": "[576]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "403",
+      "name": "406",
       "members": [
         {
           "name": "members",
-          "type": "[573]"
+          "type": "[577]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "404",
+      "name": "407",
       "members": [
         {
           "name": "arg-type",
@@ -12916,7 +13014,7 @@
       "meta-type": "object"
     },
     {
-      "name": "405",
+      "name": "408",
       "members": [
         {
           "name": "arg-type",
@@ -12926,7 +13024,7 @@
       "meta-type": "object"
     },
     {
-      "name": "406",
+      "name": "409",
       "members": [
         {
           "name": "authz-list"
@@ -13108,23 +13206,23 @@
       ]
     },
     {
-      "name": "407",
+      "name": "410",
       "members": [
         {
           "name": "policy",
           "default": null,
-          "type": "574"
+          "type": "578"
         },
         {
           "name": "rules",
           "default": null,
-          "type": "[575]"
+          "type": "[579]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "408",
+      "name": "411",
       "members": [
         {
           "name": "filename",
@@ -13139,7 +13237,7 @@
       "meta-type": "object"
     },
     {
-      "name": "409",
+      "name": "412",
       "members": [
         {
           "name": "service",
@@ -13149,7 +13247,7 @@
       "meta-type": "object"
     },
     {
-      "name": "410",
+      "name": "413",
       "members": [
         {
           "name": "identity",
@@ -13159,7 +13257,7 @@
       "meta-type": "object"
     },
     {
-      "name": "411",
+      "name": "414",
       "members": [
         {
           "name": "if",
@@ -13173,7 +13271,7 @@
       "meta-type": "object"
     },
     {
-      "name": "412",
+      "name": "415",
       "members": [
         {
           "name": "primary_in",
@@ -13220,7 +13318,7 @@
       "meta-type": "object"
     },
     {
-      "name": "413",
+      "name": "416",
       "members": [
         {
           "name": "queues",
@@ -13231,7 +13329,7 @@
       "meta-type": "object"
     },
     {
-      "name": "414",
+      "name": "417",
       "members": [
         {
           "name": "queues",
@@ -13246,7 +13344,7 @@
       "meta-type": "object"
     },
     {
-      "name": "415",
+      "name": "418",
       "members": [
         {
           "name": "addr",
@@ -13261,7 +13359,7 @@
       "meta-type": "object"
     },
     {
-      "name": "416",
+      "name": "419",
       "members": [
         {
           "name": "netdev",
@@ -13270,7 +13368,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "576"
+          "type": "580"
         },
         {
           "name": "status",
@@ -13285,7 +13383,7 @@
         {
           "name": "insert",
           "default": null,
-          "type": "577"
+          "type": "581"
         },
         {
           "name": "interval",
@@ -13295,7 +13393,7 @@
       "meta-type": "object"
     },
     {
-      "name": "417",
+      "name": "420",
       "members": [
         {
           "name": "netdev",
@@ -13304,7 +13402,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "576"
+          "type": "580"
         },
         {
           "name": "status",
@@ -13319,7 +13417,7 @@
         {
           "name": "insert",
           "default": null,
-          "type": "577"
+          "type": "581"
         },
         {
           "name": "file",
@@ -13334,7 +13432,7 @@
       "meta-type": "object"
     },
     {
-      "name": "418",
+      "name": "421",
       "members": [
         {
           "name": "netdev",
@@ -13343,7 +13441,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "576"
+          "type": "580"
         },
         {
           "name": "status",
@@ -13358,7 +13456,7 @@
         {
           "name": "insert",
           "default": null,
-          "type": "577"
+          "type": "581"
         },
         {
           "name": "outdev",
@@ -13373,7 +13471,7 @@
       "meta-type": "object"
     },
     {
-      "name": "419",
+      "name": "422",
       "members": [
         {
           "name": "netdev",
@@ -13382,7 +13480,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "576"
+          "type": "580"
         },
         {
           "name": "status",
@@ -13397,7 +13495,7 @@
         {
           "name": "insert",
           "default": null,
-          "type": "577"
+          "type": "581"
         },
         {
           "name": "indev",
@@ -13418,7 +13516,7 @@
       "meta-type": "object"
     },
     {
-      "name": "420",
+      "name": "423",
       "members": [
         {
           "name": "netdev",
@@ -13427,7 +13525,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "576"
+          "type": "580"
         },
         {
           "name": "status",
@@ -13442,13 +13540,13 @@
         {
           "name": "insert",
           "default": null,
-          "type": "577"
+          "type": "581"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "421",
+      "name": "424",
       "members": [
         {
           "name": "netdev",
@@ -13457,7 +13555,7 @@
         {
           "name": "queue",
           "default": null,
-          "type": "576"
+          "type": "580"
         },
         {
           "name": "status",
@@ -13472,7 +13570,7 @@
         {
           "name": "insert",
           "default": null,
-          "type": "577"
+          "type": "581"
         },
         {
           "name": "vnet_hdr_support",
@@ -13483,7 +13581,7 @@
       "meta-type": "object"
     },
     {
-      "name": "422",
+      "name": "425",
       "members": [
         {
           "name": "name",
@@ -13523,7 +13621,7 @@
       "meta-type": "object"
     },
     {
-      "name": "423",
+      "name": "426",
       "members": [
         {
           "name": "evdev",
@@ -13542,13 +13640,13 @@
         {
           "name": "grab-toggle",
           "default": null,
-          "type": "578"
+          "type": "582"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "424",
+      "name": "427",
       "members": [
         {
           "name": "aio-max-batch",
@@ -13584,7 +13682,7 @@
       "meta-type": "object"
     },
     {
-      "name": "425",
+      "name": "428",
       "members": [
         {
           "name": "aio-max-batch",
@@ -13605,7 +13703,7 @@
       "meta-type": "object"
     },
     {
-      "name": "426",
+      "name": "429",
       "members": [
         {
           "name": "dump",
@@ -13625,7 +13723,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "448"
+          "type": "451"
         },
         {
           "name": "prealloc",
@@ -13660,7 +13758,7 @@
       "meta-type": "object"
     },
     {
-      "name": "427",
+      "name": "430",
       "members": [
         {
           "name": "dump",
@@ -13680,7 +13778,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "448"
+          "type": "451"
         },
         {
           "name": "prealloc",
@@ -13739,7 +13837,7 @@
       "meta-type": "object"
     },
     {
-      "name": "428",
+      "name": "431",
       "members": [
         {
           "name": "dump",
@@ -13759,7 +13857,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "448"
+          "type": "451"
         },
         {
           "name": "prealloc",
@@ -13809,7 +13907,7 @@
       "meta-type": "object"
     },
     {
-      "name": "429",
+      "name": "432",
       "members": [
         {
           "name": "dump",
@@ -13829,7 +13927,7 @@
         {
           "name": "policy",
           "default": null,
-          "type": "448"
+          "type": "451"
         },
         {
           "name": "prealloc",
@@ -13864,7 +13962,7 @@
       "meta-type": "object"
     },
     {
-      "name": "430",
+      "name": "433",
       "members": [
         {
           "name": "path",
@@ -13874,7 +13972,7 @@
       "meta-type": "object"
     },
     {
-      "name": "431",
+      "name": "434",
       "members": [
         {
           "name": "chardev",
@@ -13889,7 +13987,7 @@
       "meta-type": "object"
     },
     {
-      "name": "432",
+      "name": "435",
       "members": [
         {
           "name": "opened",
@@ -13903,7 +14001,7 @@
       "meta-type": "object"
     },
     {
-      "name": "433",
+      "name": "436",
       "members": [
         {
           "name": "opened",
@@ -13921,7 +14019,7 @@
       "meta-type": "object"
     },
     {
-      "name": "434",
+      "name": "437",
       "members": [
         {
           "name": "opened",
@@ -13940,7 +14038,7 @@
       "meta-type": "object"
     },
     {
-      "name": "435",
+      "name": "438",
       "members": [
         {
           "name": "loaded",
@@ -13953,7 +14051,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "579"
+          "type": "583"
         },
         {
           "name": "keyid",
@@ -13979,7 +14077,7 @@
       "meta-type": "object"
     },
     {
-      "name": "436",
+      "name": "439",
       "members": [
         {
           "name": "loaded",
@@ -13992,7 +14090,7 @@
         {
           "name": "format",
           "default": null,
-          "type": "579"
+          "type": "583"
         },
         {
           "name": "keyid",
@@ -14012,7 +14110,7 @@
       "meta-type": "object"
     },
     {
-      "name": "437",
+      "name": "440",
       "members": [
         {
           "name": "sev-device",
@@ -14057,12 +14155,12 @@
       "meta-type": "object"
     },
     {
-      "name": "438",
+      "name": "441",
       "members": [
         {
           "name": "limits",
           "default": null,
-          "type": "580"
+          "type": "584"
         },
         {
           "name": "x-iops-total",
@@ -14220,7 +14318,7 @@
       "meta-type": "object"
     },
     {
-      "name": "439",
+      "name": "442",
       "members": [
         {
           "name": "verify-peer",
@@ -14235,7 +14333,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "581"
+          "type": "585"
         },
         {
           "name": "priority",
@@ -14254,7 +14352,7 @@
       "meta-type": "object"
     },
     {
-      "name": "440",
+      "name": "443",
       "members": [
         {
           "name": "verify-peer",
@@ -14269,7 +14367,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "581"
+          "type": "585"
         },
         {
           "name": "priority",
@@ -14293,7 +14391,7 @@
       "meta-type": "object"
     },
     {
-      "name": "441",
+      "name": "444",
       "members": [
         {
           "name": "verify-peer",
@@ -14308,7 +14406,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "581"
+          "type": "585"
         },
         {
           "name": "priority",
@@ -14337,7 +14435,7 @@
       "meta-type": "object"
     },
     {
-      "name": "442",
+      "name": "445",
       "members": [
         {
           "name": "verify-peer",
@@ -14352,7 +14450,7 @@
         {
           "name": "endpoint",
           "default": null,
-          "type": "581"
+          "type": "585"
         },
         {
           "name": "priority",
@@ -14363,7 +14461,7 @@
       "meta-type": "object"
     },
     {
-      "name": "443",
+      "name": "446",
       "members": [
         {
           "name": "fd",
@@ -14377,11 +14475,11 @@
       "meta-type": "object"
     },
     {
-      "name": "444",
+      "name": "447",
       "members": [
         {
           "name": "socket",
-          "type": "384"
+          "type": "387"
         },
         {
           "name": "device",
@@ -14391,7 +14489,7 @@
       "meta-type": "object"
     },
     {
-      "name": "445",
+      "name": "448",
       "members": [
         {
           "name": "node-id",
@@ -14427,7 +14525,7 @@
       "meta-type": "object"
     },
     {
-      "name": "446",
+      "name": "449",
       "members": [
         {
           "name": "aarch64"
@@ -14559,17 +14657,17 @@
       ]
     },
     {
-      "name": "447",
+      "name": "450",
       "members": [
         {
           "name": "cpu-state",
-          "type": "582"
+          "type": "586"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "448",
+      "name": "451",
       "members": [
         {
           "name": "default"
@@ -14593,7 +14691,7 @@
       ]
     },
     {
-      "name": "449",
+      "name": "452",
       "members": [
         {
           "name": "node"
@@ -14621,7 +14719,7 @@
       ]
     },
     {
-      "name": "450",
+      "name": "453",
       "members": [
         {
           "name": "nodeid",
@@ -14652,7 +14750,7 @@
       "meta-type": "object"
     },
     {
-      "name": "451",
+      "name": "454",
       "members": [
         {
           "name": "src",
@@ -14670,7 +14768,7 @@
       "meta-type": "object"
     },
     {
-      "name": "452",
+      "name": "455",
       "members": [
         {
           "name": "node-id",
@@ -14706,7 +14804,7 @@
       "meta-type": "object"
     },
     {
-      "name": "453",
+      "name": "456",
       "members": [
         {
           "name": "initiator",
@@ -14718,11 +14816,11 @@
         },
         {
           "name": "hierarchy",
-          "type": "583"
+          "type": "587"
         },
         {
           "name": "data-type",
-          "type": "584"
+          "type": "588"
         },
         {
           "name": "latency",
@@ -14738,7 +14836,7 @@
       "meta-type": "object"
     },
     {
-      "name": "454",
+      "name": "457",
       "members": [
         {
           "name": "node-id",
@@ -14754,11 +14852,11 @@
         },
         {
           "name": "associativity",
-          "type": "585"
+          "type": "589"
         },
         {
           "name": "policy",
-          "type": "586"
+          "type": "590"
         },
         {
           "name": "line",
@@ -14768,7 +14866,7 @@
       "meta-type": "object"
     },
     {
-      "name": "455",
+      "name": "458",
       "members": [
         {
           "name": "dimm"
@@ -14796,47 +14894,47 @@
       ]
     },
     {
-      "name": "456",
+      "name": "459",
       "members": [
         {
           "name": "data",
-          "type": "587"
+          "type": "591"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "457",
+      "name": "460",
       "members": [
         {
           "name": "data",
-          "type": "588"
+          "type": "592"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "458",
+      "name": "461",
       "members": [
         {
           "name": "data",
-          "type": "589"
+          "type": "593"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "459",
+      "name": "462",
       "members": [
         {
           "name": "data",
-          "type": "590"
+          "type": "594"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "460",
+      "name": "463",
       "members": [
         {
           "name": "name",
@@ -14851,7 +14949,7 @@
       "meta-type": "object"
     },
     {
-      "name": "461",
+      "name": "464",
       "members": [
         {
           "name": "incompatible"
@@ -14875,7 +14973,7 @@
       ]
     },
     {
-      "name": "462",
+      "name": "465",
       "members": [
         {
           "name": "static"
@@ -14891,7 +14989,7 @@
       ]
     },
     {
-      "name": "463",
+      "name": "466",
       "members": [
         {
           "name": "none"
@@ -14911,7 +15009,7 @@
       ]
     },
     {
-      "name": "464",
+      "name": "467",
       "members": [
         {
           "name": "block-node"
@@ -14931,7 +15029,7 @@
       ]
     },
     {
-      "name": "465",
+      "name": "468",
       "members": [
         {
           "name": "node-name",
@@ -14941,7 +15039,7 @@
       "meta-type": "object"
     },
     {
-      "name": "466",
+      "name": "469",
       "members": [
         {
           "name": "id",
@@ -14951,12 +15049,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[467]",
-      "element-type": "467",
+      "name": "[470]",
+      "element-type": "470",
       "meta-type": "array"
     },
     {
-      "name": "467",
+      "name": "470",
       "members": [
         {
           "name": "fd",
@@ -14971,12 +15069,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[468]",
-      "element-type": "468",
+      "name": "[471]",
+      "element-type": "471",
       "meta-type": "array"
     },
     {
-      "name": "468",
+      "name": "471",
       "members": [
         {
           "name": "name",
@@ -14984,7 +15082,7 @@
         },
         {
           "name": "type",
-          "type": "591"
+          "type": "595"
         },
         {
           "name": "help",
@@ -15000,7 +15098,7 @@
       "meta-type": "object"
     },
     {
-      "name": "469",
+      "name": "472",
       "members": [
         {
           "name": "uninit"
@@ -15032,12 +15130,12 @@
       ]
     },
     {
-      "name": "[470]",
-      "element-type": "470",
+      "name": "[473]",
+      "element-type": "473",
       "meta-type": "array"
     },
     {
-      "name": "470",
+      "name": "473",
       "members": [
         {
           "name": "node",
@@ -15051,7 +15149,7 @@
       "meta-type": "object"
     },
     {
-      "name": "471",
+      "name": "474",
       "members": [
         {
           "name": "DIMM"
@@ -15067,12 +15165,12 @@
       ]
     },
     {
-      "name": "[472]",
-      "element-type": "472",
+      "name": "[475]",
+      "element-type": "475",
       "meta-type": "array"
     },
     {
-      "name": "472",
+      "name": "475",
       "members": [
         {
           "name": "bus",
@@ -15088,11 +15186,11 @@
         },
         {
           "name": "class_info",
-          "type": "592"
+          "type": "596"
         },
         {
           "name": "id",
-          "type": "593"
+          "type": "597"
         },
         {
           "name": "irq",
@@ -15110,17 +15208,17 @@
         {
           "name": "pci_bridge",
           "default": null,
-          "type": "594"
+          "type": "598"
         },
         {
           "name": "regions",
-          "type": "[595]"
+          "type": "[599]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "473",
+      "name": "476",
       "members": [
         {
           "name": "vm"
@@ -15136,16 +15234,16 @@
       ]
     },
     {
-      "name": "[474]",
-      "element-type": "474",
+      "name": "[477]",
+      "element-type": "477",
       "meta-type": "array"
     },
     {
-      "name": "474",
+      "name": "477",
       "members": [
         {
           "name": "provider",
-          "type": "476"
+          "type": "479"
         },
         {
           "name": "names",
@@ -15156,7 +15254,7 @@
       "meta-type": "object"
     },
     {
-      "name": "475",
+      "name": "478",
       "members": [
         {
           "name": "vcpus",
@@ -15167,7 +15265,7 @@
       "meta-type": "object"
     },
     {
-      "name": "476",
+      "name": "479",
       "members": [
         {
           "name": "kvm"
@@ -15179,12 +15277,12 @@
       ]
     },
     {
-      "name": "[477]",
-      "element-type": "477",
+      "name": "[480]",
+      "element-type": "480",
       "meta-type": "array"
     },
     {
-      "name": "477",
+      "name": "480",
       "members": [
         {
           "name": "name",
@@ -15192,18 +15290,18 @@
         },
         {
           "name": "value",
-          "type": "596"
+          "type": "600"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[478]",
-      "element-type": "478",
+      "name": "[481]",
+      "element-type": "481",
       "meta-type": "array"
     },
     {
-      "name": "478",
+      "name": "481",
       "members": [
         {
           "name": "name",
@@ -15211,12 +15309,12 @@
         },
         {
           "name": "type",
-          "type": "597"
+          "type": "601"
         },
         {
           "name": "unit",
           "default": null,
-          "type": "598"
+          "type": "602"
         },
         {
           "name": "base",
@@ -15236,7 +15334,7 @@
       "meta-type": "object"
     },
     {
-      "name": "479",
+      "name": "482",
       "members": [
         {
           "name": "hyper-v"
@@ -15252,7 +15350,7 @@
       ]
     },
     {
-      "name": "480",
+      "name": "483",
       "members": [
         {
           "name": "arg1",
@@ -15278,7 +15376,7 @@
       "meta-type": "object"
     },
     {
-      "name": "481",
+      "name": "484",
       "members": [
         {
           "name": "core",
@@ -15294,18 +15392,18 @@
         },
         {
           "name": "reason",
-          "type": "599"
+          "type": "603"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[482]",
-      "element-type": "482",
+      "name": "[485]",
+      "element-type": "485",
       "meta-type": "array"
     },
     {
-      "name": "482",
+      "name": "485",
       "members": [
         {
           "name": "interval_length",
@@ -15359,7 +15457,7 @@
       "meta-type": "object"
     },
     {
-      "name": "483",
+      "name": "486",
       "members": [
         {
           "name": "boundaries",
@@ -15373,7 +15471,7 @@
       "meta-type": "object"
     },
     {
-      "name": "484",
+      "name": "487",
       "members": [
         {
           "name": "discard-nb-ok",
@@ -15391,7 +15489,7 @@
       "meta-type": "object"
     },
     {
-      "name": "485",
+      "name": "488",
       "members": [
         {
           "name": "completion-errors",
@@ -15414,36 +15512,36 @@
       "meta-type": "array"
     },
     {
-      "name": "486",
+      "name": "489",
       "tag": "type",
       "variants": [
         {
           "case": "qcow2",
-          "type": "601"
+          "type": "605"
         },
         {
           "case": "vmdk",
-          "type": "602"
+          "type": "606"
         },
         {
           "case": "luks",
-          "type": "603"
+          "type": "607"
         },
         {
           "case": "rbd",
-          "type": "604"
+          "type": "608"
         }
       ],
       "members": [
         {
           "name": "type",
-          "type": "600"
+          "type": "604"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "487",
+      "name": "490",
       "members": [
         {
           "name": "block-backend"
@@ -15463,12 +15561,12 @@
       ]
     },
     {
-      "name": "[488]",
-      "element-type": "488",
+      "name": "[491]",
+      "element-type": "491",
       "meta-type": "array"
     },
     {
-      "name": "488",
+      "name": "491",
       "members": [
         {
           "name": "consistent-read"
@@ -15492,7 +15590,7 @@
       ]
     },
     {
-      "name": "489",
+      "name": "492",
       "members": [
         {
           "type": "49"
@@ -15504,16 +15602,16 @@
       "meta-type": "alternate"
     },
     {
-      "name": "[490]",
-      "element-type": "490",
+      "name": "[493]",
+      "element-type": "493",
       "meta-type": "array"
     },
     {
-      "name": "490",
+      "name": "493",
       "members": [
         {
           "name": "event",
-          "type": "605"
+          "type": "609"
         },
         {
           "name": "state",
@@ -15523,7 +15621,7 @@
         {
           "name": "iotype",
           "default": null,
-          "type": "606"
+          "type": "610"
         },
         {
           "name": "errno",
@@ -15549,16 +15647,16 @@
       "meta-type": "object"
     },
     {
-      "name": "[491]",
-      "element-type": "491",
+      "name": "[494]",
+      "element-type": "494",
       "meta-type": "array"
     },
     {
-      "name": "491",
+      "name": "494",
       "members": [
         {
           "name": "event",
-          "type": "605"
+          "type": "609"
         },
         {
           "name": "state",
@@ -15573,7 +15671,23 @@
       "meta-type": "object"
     },
     {
-      "name": "492",
+      "name": "495",
+      "members": [
+        {
+          "name": "break-guest-write"
+        },
+        {
+          "name": "break-snapshot"
+        }
+      ],
+      "meta-type": "enum",
+      "values": [
+        "break-guest-write",
+        "break-snapshot"
+      ]
+    },
+    {
+      "name": "496",
       "members": [
         {
           "name": "auto"
@@ -15593,7 +15707,7 @@
       ]
     },
     {
-      "name": "493",
+      "name": "497",
       "members": [
         {
           "name": "threads"
@@ -15613,7 +15727,7 @@
       ]
     },
     {
-      "name": "494",
+      "name": "498",
       "members": [
         {
           "name": "tcp"
@@ -15629,7 +15743,7 @@
       ]
     },
     {
-      "name": "495",
+      "name": "499",
       "members": [
         {
           "name": "crc32c"
@@ -15653,11 +15767,11 @@
       ]
     },
     {
-      "name": "496",
+      "name": "500",
       "members": [
         {
           "name": "type",
-          "type": "607"
+          "type": "611"
         },
         {
           "name": "host",
@@ -15667,7 +15781,7 @@
       "meta-type": "object"
     },
     {
-      "name": "497",
+      "name": "501",
       "members": [
         {
           "type": "49"
@@ -15682,62 +15796,62 @@
       "meta-type": "alternate"
     },
     {
-      "name": "498",
+      "name": "502",
       "members": [
         {
-          "type": "608"
+          "type": "612"
         },
         {
-          "type": "609"
+          "type": "613"
         }
       ],
       "meta-type": "alternate"
     },
     {
-      "name": "499",
+      "name": "503",
       "tag": "format",
       "variants": [
         {
           "case": "aes",
-          "type": "611"
+          "type": "615"
         },
         {
           "case": "luks",
-          "type": "612"
+          "type": "616"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "610"
+          "type": "614"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "500",
+      "name": "504",
       "tag": "format",
       "variants": [
         {
           "case": "aes",
-          "type": "611"
+          "type": "615"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "613"
+          "type": "617"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[489]",
-      "element-type": "489",
+      "name": "[492]",
+      "element-type": "492",
       "meta-type": "array"
     },
     {
-      "name": "501",
+      "name": "505",
       "members": [
         {
           "name": "quorum"
@@ -15753,33 +15867,33 @@
       ]
     },
     {
-      "name": "502",
+      "name": "506",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "615"
+          "type": "619"
         },
         {
           "case": "luks2",
-          "type": "616"
+          "type": "620"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "614"
+          "type": "618"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[503]",
-      "element-type": "503",
+      "name": "[507]",
+      "element-type": "507",
       "meta-type": "array"
     },
     {
-      "name": "503",
+      "name": "507",
       "members": [
         {
           "name": "cephx"
@@ -15795,12 +15909,12 @@
       ]
     },
     {
-      "name": "[504]",
-      "element-type": "504",
+      "name": "[508]",
+      "element-type": "508",
       "meta-type": "array"
     },
     {
-      "name": "504",
+      "name": "508",
       "members": [
         {
           "name": "host",
@@ -15814,7 +15928,7 @@
       "meta-type": "object"
     },
     {
-      "name": "505",
+      "name": "509",
       "members": [
         {
           "name": "primary"
@@ -15830,7 +15944,7 @@
       ]
     },
     {
-      "name": "506",
+      "name": "510",
       "members": [
         {
           "name": "host",
@@ -15874,12 +15988,12 @@
       "meta-type": "object"
     },
     {
-      "name": "507",
+      "name": "511",
       "tag": "mode",
       "variants": [
         {
           "case": "hash",
-          "type": "618"
+          "type": "622"
         },
         {
           "case": "none",
@@ -15893,13 +16007,13 @@
       "members": [
         {
           "name": "mode",
-          "type": "617"
+          "type": "621"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "508",
+      "name": "512",
       "members": [
         {
           "name": "filename",
@@ -15912,7 +16026,7 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "619"
+          "type": "623"
         },
         {
           "name": "nocow",
@@ -15928,11 +16042,11 @@
       "meta-type": "object"
     },
     {
-      "name": "509",
+      "name": "513",
       "members": [
         {
           "name": "location",
-          "type": "289"
+          "type": "292"
         },
         {
           "name": "size",
@@ -15941,13 +16055,13 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "619"
+          "type": "623"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "510",
+      "name": "514",
       "members": [
         {
           "name": "key-secret",
@@ -15957,27 +16071,27 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "620"
+          "type": "624"
         },
         {
           "name": "cipher-mode",
           "default": null,
-          "type": "621"
+          "type": "625"
         },
         {
           "name": "ivgen-alg",
           "default": null,
-          "type": "622"
+          "type": "626"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "623"
+          "type": "627"
         },
         {
           "name": "hash-alg",
           "default": null,
-          "type": "623"
+          "type": "627"
         },
         {
           "name": "iter-time",
@@ -15986,7 +16100,7 @@
         },
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -15995,17 +16109,17 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "619"
+          "type": "623"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "511",
+      "name": "515",
       "members": [
         {
           "name": "location",
-          "type": "295"
+          "type": "298"
         },
         {
           "name": "size",
@@ -16015,11 +16129,11 @@
       "meta-type": "object"
     },
     {
-      "name": "512",
+      "name": "516",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16034,11 +16148,11 @@
       "meta-type": "object"
     },
     {
-      "name": "513",
+      "name": "517",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16052,22 +16166,22 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "624"
+          "type": "628"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "514",
+      "name": "518",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "data-file",
           "default": null,
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "data-file-raw",
@@ -16086,7 +16200,7 @@
         {
           "name": "version",
           "default": null,
-          "type": "625"
+          "type": "629"
         },
         {
           "name": "backing-file",
@@ -16096,12 +16210,12 @@
         {
           "name": "backing-fmt",
           "default": null,
-          "type": "276"
+          "type": "279"
         },
         {
           "name": "encrypt",
           "default": null,
-          "type": "624"
+          "type": "628"
         },
         {
           "name": "cluster-size",
@@ -16111,7 +16225,7 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "619"
+          "type": "623"
         },
         {
           "name": "lazy-refcounts",
@@ -16126,17 +16240,17 @@
         {
           "name": "compression-type",
           "default": null,
-          "type": "626"
+          "type": "630"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "515",
+      "name": "519",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16150,7 +16264,7 @@
         {
           "name": "backing-fmt",
           "default": null,
-          "type": "276"
+          "type": "279"
         },
         {
           "name": "cluster-size",
@@ -16166,11 +16280,11 @@
       "meta-type": "object"
     },
     {
-      "name": "516",
+      "name": "520",
       "members": [
         {
           "name": "location",
-          "type": "304"
+          "type": "307"
         },
         {
           "name": "size",
@@ -16184,17 +16298,17 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "627"
+          "type": "631"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "517",
+      "name": "521",
       "members": [
         {
           "name": "location",
-          "type": "306"
+          "type": "309"
         },
         {
           "name": "size",
@@ -16204,11 +16318,11 @@
       "meta-type": "object"
     },
     {
-      "name": "518",
+      "name": "522",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16217,17 +16331,17 @@
         {
           "name": "preallocation",
           "default": null,
-          "type": "619"
+          "type": "623"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "519",
+      "name": "523",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16246,7 +16360,7 @@
         {
           "name": "subformat",
           "default": null,
-          "type": "628"
+          "type": "632"
         },
         {
           "name": "block-state-zero",
@@ -16257,11 +16371,11 @@
       "meta-type": "object"
     },
     {
-      "name": "520",
+      "name": "524",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16270,12 +16384,12 @@
         {
           "name": "extents",
           "default": null,
-          "type": "[489]"
+          "type": "[492]"
         },
         {
           "name": "subformat",
           "default": null,
-          "type": "629"
+          "type": "633"
         },
         {
           "name": "backing-file",
@@ -16285,7 +16399,7 @@
         {
           "name": "adapter-type",
           "default": null,
-          "type": "630"
+          "type": "634"
         },
         {
           "name": "hwversion",
@@ -16306,11 +16420,11 @@
       "meta-type": "object"
     },
     {
-      "name": "521",
+      "name": "525",
       "members": [
         {
           "name": "file",
-          "type": "489"
+          "type": "492"
         },
         {
           "name": "size",
@@ -16319,7 +16433,7 @@
         {
           "name": "subformat",
           "default": null,
-          "type": "631"
+          "type": "635"
         },
         {
           "name": "force-size",
@@ -16330,11 +16444,11 @@
       "meta-type": "object"
     },
     {
-      "name": "522",
+      "name": "526",
       "members": [
         {
           "name": "state",
-          "type": "632"
+          "type": "636"
         },
         {
           "name": "new-secret",
@@ -16365,12 +16479,12 @@
       "meta-type": "object"
     },
     {
-      "name": "523",
+      "name": "527",
       "members": [
         {
           "name": "encrypt",
           "default": null,
-          "type": "633"
+          "type": "637"
         }
       ],
       "meta-type": "object"
@@ -16381,7 +16495,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "524",
+      "name": "528",
       "members": [
         {
           "name": "inet"
@@ -16405,47 +16519,47 @@
       ]
     },
     {
-      "name": "525",
+      "name": "529",
       "members": [
         {
           "name": "data",
-          "type": "506"
+          "type": "510"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "526",
+      "name": "530",
       "members": [
         {
           "name": "data",
-          "type": "555"
+          "type": "559"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "527",
+      "name": "531",
       "members": [
         {
           "name": "data",
-          "type": "556"
+          "type": "560"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "528",
+      "name": "532",
       "members": [
         {
           "name": "data",
-          "type": "544"
+          "type": "548"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "529",
+      "name": "533",
       "members": [
         {
           "name": "off"
@@ -16465,7 +16579,7 @@
       ]
     },
     {
-      "name": "530",
+      "name": "534",
       "members": [
         {
           "name": "file"
@@ -16561,142 +16675,142 @@
       ]
     },
     {
-      "name": "531",
+      "name": "535",
       "members": [
         {
           "name": "data",
-          "type": "634"
+          "type": "638"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "532",
+      "name": "536",
       "members": [
         {
           "name": "data",
-          "type": "635"
+          "type": "639"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "533",
+      "name": "537",
       "members": [
         {
           "name": "data",
-          "type": "636"
+          "type": "640"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "534",
+      "name": "538",
       "members": [
         {
           "name": "data",
-          "type": "637"
+          "type": "641"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "535",
+      "name": "539",
       "members": [
         {
           "name": "data",
-          "type": "638"
+          "type": "642"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "536",
+      "name": "540",
       "members": [
         {
           "name": "data",
-          "type": "639"
+          "type": "643"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "537",
+      "name": "541",
       "members": [
         {
           "name": "data",
-          "type": "640"
+          "type": "644"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "538",
+      "name": "542",
       "members": [
         {
           "name": "data",
-          "type": "641"
+          "type": "645"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "539",
+      "name": "543",
       "members": [
         {
           "name": "data",
-          "type": "642"
+          "type": "646"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "540",
+      "name": "544",
       "members": [
         {
           "name": "data",
-          "type": "643"
+          "type": "647"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "541",
+      "name": "545",
       "members": [
         {
           "name": "data",
-          "type": "644"
+          "type": "648"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "542",
+      "name": "546",
       "members": [
         {
           "name": "data",
-          "type": "645"
+          "type": "649"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "543",
+      "name": "547",
       "members": [
         {
           "name": "data",
-          "type": "646"
+          "type": "650"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[544]",
-      "element-type": "544",
+      "name": "[548]",
+      "element-type": "548",
       "meta-type": "array"
     },
     {
-      "name": "544",
+      "name": "548",
       "members": [
         {
           "name": "str",
@@ -16706,27 +16820,27 @@
       "meta-type": "object"
     },
     {
-      "name": "545",
+      "name": "549",
       "members": [
         {
           "name": "data",
-          "type": "647"
+          "type": "651"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "546",
+      "name": "550",
       "members": [
         {
           "name": "data",
-          "type": "648"
+          "type": "652"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "547",
+      "name": "551",
       "members": [
         {
           "name": "number"
@@ -16742,7 +16856,7 @@
       ]
     },
     {
-      "name": "548",
+      "name": "552",
       "members": [
         {
           "name": "data",
@@ -16752,17 +16866,17 @@
       "meta-type": "object"
     },
     {
-      "name": "549",
+      "name": "553",
       "members": [
         {
           "name": "data",
-          "type": "649"
+          "type": "653"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "550",
+      "name": "554",
       "members": [
         {
           "name": "key"
@@ -16786,37 +16900,37 @@
       ]
     },
     {
-      "name": "551",
+      "name": "555",
       "members": [
         {
           "name": "data",
-          "type": "650"
+          "type": "654"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "552",
+      "name": "556",
       "members": [
         {
           "name": "data",
-          "type": "651"
+          "type": "655"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "553",
+      "name": "557",
       "members": [
         {
           "name": "data",
-          "type": "652"
+          "type": "656"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "554",
+      "name": "558",
       "members": [
         {
           "name": "lctrl-lalt"
@@ -16841,7 +16955,7 @@
       "meta-type": "builtin"
     },
     {
-      "name": "555",
+      "name": "559",
       "members": [
         {
           "name": "path",
@@ -16861,7 +16975,7 @@
       "meta-type": "object"
     },
     {
-      "name": "556",
+      "name": "560",
       "members": [
         {
           "name": "cid",
@@ -16875,12 +16989,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[557]",
-      "element-type": "557",
+      "name": "[561]",
+      "element-type": "561",
       "meta-type": "array"
     },
     {
-      "name": "557",
+      "name": "561",
       "members": [
         {
           "name": "name",
@@ -16893,13 +17007,13 @@
         {
           "name": "transform",
           "default": null,
-          "type": "653"
+          "type": "657"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "558",
+      "name": "562",
       "members": [
         {
           "name": "abort"
@@ -16958,17 +17072,17 @@
       ]
     },
     {
-      "name": "559",
+      "name": "563",
       "members": [
         {
           "name": "data",
-          "type": "654"
+          "type": "658"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "560",
+      "name": "564",
       "members": [
         {
           "name": "data",
@@ -16978,7 +17092,7 @@
       "meta-type": "object"
     },
     {
-      "name": "561",
+      "name": "565",
       "members": [
         {
           "name": "data",
@@ -16988,7 +17102,7 @@
       "meta-type": "object"
     },
     {
-      "name": "562",
+      "name": "566",
       "members": [
         {
           "name": "data",
@@ -16998,7 +17112,7 @@
       "meta-type": "object"
     },
     {
-      "name": "563",
+      "name": "567",
       "members": [
         {
           "name": "data",
@@ -17008,7 +17122,7 @@
       "meta-type": "object"
     },
     {
-      "name": "564",
+      "name": "568",
       "members": [
         {
           "name": "data",
@@ -17018,7 +17132,7 @@
       "meta-type": "object"
     },
     {
-      "name": "565",
+      "name": "569",
       "members": [
         {
           "name": "data",
@@ -17028,7 +17142,7 @@
       "meta-type": "object"
     },
     {
-      "name": "566",
+      "name": "570",
       "members": [
         {
           "name": "data",
@@ -17038,7 +17152,7 @@
       "meta-type": "object"
     },
     {
-      "name": "567",
+      "name": "571",
       "members": [
         {
           "name": "data",
@@ -17048,7 +17162,7 @@
       "meta-type": "object"
     },
     {
-      "name": "568",
+      "name": "572",
       "members": [
         {
           "name": "individual"
@@ -17064,7 +17178,7 @@
       ]
     },
     {
-      "name": "569",
+      "name": "573",
       "members": [
         {
           "name": "string"
@@ -17104,12 +17218,12 @@
       ]
     },
     {
-      "name": "[570]",
-      "element-type": "570",
+      "name": "[574]",
+      "element-type": "574",
       "meta-type": "array"
     },
     {
-      "name": "570",
+      "name": "574",
       "members": [
         {
           "name": "name",
@@ -17124,12 +17238,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[571]",
-      "element-type": "571",
+      "name": "[575]",
+      "element-type": "575",
       "meta-type": "array"
     },
     {
-      "name": "571",
+      "name": "575",
       "members": [
         {
           "name": "name",
@@ -17153,12 +17267,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[572]",
-      "element-type": "572",
+      "name": "[576]",
+      "element-type": "576",
       "meta-type": "array"
     },
     {
-      "name": "572",
+      "name": "576",
       "members": [
         {
           "name": "case",
@@ -17172,12 +17286,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[573]",
-      "element-type": "573",
+      "name": "[577]",
+      "element-type": "577",
       "meta-type": "array"
     },
     {
-      "name": "573",
+      "name": "577",
       "members": [
         {
           "name": "type",
@@ -17187,7 +17301,7 @@
       "meta-type": "object"
     },
     {
-      "name": "574",
+      "name": "578",
       "members": [
         {
           "name": "deny"
@@ -17203,12 +17317,12 @@
       ]
     },
     {
-      "name": "[575]",
-      "element-type": "575",
+      "name": "[579]",
+      "element-type": "579",
       "meta-type": "array"
     },
     {
-      "name": "575",
+      "name": "579",
       "members": [
         {
           "name": "match",
@@ -17216,18 +17330,18 @@
         },
         {
           "name": "policy",
-          "type": "574"
+          "type": "578"
         },
         {
           "name": "format",
           "default": null,
-          "type": "655"
+          "type": "659"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "576",
+      "name": "580",
       "members": [
         {
           "name": "all"
@@ -17247,7 +17361,7 @@
       ]
     },
     {
-      "name": "577",
+      "name": "581",
       "members": [
         {
           "name": "before"
@@ -17263,7 +17377,7 @@
       ]
     },
     {
-      "name": "578",
+      "name": "582",
       "members": [
         {
           "name": "ctrl-ctrl"
@@ -17295,7 +17409,7 @@
       ]
     },
     {
-      "name": "579",
+      "name": "583",
       "members": [
         {
           "name": "raw"
@@ -17311,7 +17425,7 @@
       ]
     },
     {
-      "name": "580",
+      "name": "584",
       "members": [
         {
           "name": "iops-total",
@@ -17412,7 +17526,7 @@
       "meta-type": "object"
     },
     {
-      "name": "581",
+      "name": "585",
       "members": [
         {
           "name": "client"
@@ -17428,7 +17542,7 @@
       ]
     },
     {
-      "name": "582",
+      "name": "586",
       "members": [
         {
           "name": "uninitialized"
@@ -17456,7 +17570,7 @@
       ]
     },
     {
-      "name": "583",
+      "name": "587",
       "members": [
         {
           "name": "memory"
@@ -17480,7 +17594,7 @@
       ]
     },
     {
-      "name": "584",
+      "name": "588",
       "members": [
         {
           "name": "access-latency"
@@ -17512,7 +17626,7 @@
       ]
     },
     {
-      "name": "585",
+      "name": "589",
       "members": [
         {
           "name": "none"
@@ -17532,7 +17646,7 @@
       ]
     },
     {
-      "name": "586",
+      "name": "590",
       "members": [
         {
           "name": "none"
@@ -17552,7 +17666,7 @@
       ]
     },
     {
-      "name": "587",
+      "name": "591",
       "members": [
         {
           "name": "id",
@@ -17591,7 +17705,7 @@
       "meta-type": "object"
     },
     {
-      "name": "588",
+      "name": "592",
       "members": [
         {
           "name": "id",
@@ -17614,7 +17728,7 @@
       "meta-type": "object"
     },
     {
-      "name": "589",
+      "name": "593",
       "members": [
         {
           "name": "id",
@@ -17653,7 +17767,7 @@
       "meta-type": "object"
     },
     {
-      "name": "590",
+      "name": "594",
       "members": [
         {
           "name": "id",
@@ -17680,7 +17794,7 @@
       "meta-type": "object"
     },
     {
-      "name": "591",
+      "name": "595",
       "members": [
         {
           "name": "string"
@@ -17704,7 +17818,7 @@
       ]
     },
     {
-      "name": "592",
+      "name": "596",
       "members": [
         {
           "name": "desc",
@@ -17719,7 +17833,7 @@
       "meta-type": "object"
     },
     {
-      "name": "593",
+      "name": "597",
       "members": [
         {
           "name": "device",
@@ -17743,27 +17857,27 @@
       "meta-type": "object"
     },
     {
-      "name": "594",
+      "name": "598",
       "members": [
         {
           "name": "bus",
-          "type": "656"
+          "type": "660"
         },
         {
           "name": "devices",
           "default": null,
-          "type": "[472]"
+          "type": "[475]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[595]",
-      "element-type": "595",
+      "name": "[599]",
+      "element-type": "599",
       "meta-type": "array"
     },
     {
-      "name": "595",
+      "name": "599",
       "members": [
         {
           "name": "bar",
@@ -17795,11 +17909,14 @@
       "meta-type": "object"
     },
     {
-      "name": "596",
+      "name": "600",
       "members": [
         {
           "type": "int"
         },
+        {
+          "type": "bool"
+        },
         {
           "type": "[int]"
         }
@@ -17807,7 +17924,7 @@
       "meta-type": "alternate"
     },
     {
-      "name": "597",
+      "name": "601",
       "members": [
         {
           "name": "cumulative"
@@ -17835,7 +17952,7 @@
       ]
     },
     {
-      "name": "598",
+      "name": "602",
       "members": [
         {
           "name": "bytes"
@@ -17845,17 +17962,21 @@
         },
         {
           "name": "cycles"
+        },
+        {
+          "name": "boolean"
         }
       ],
       "meta-type": "enum",
       "values": [
         "bytes",
         "seconds",
-        "cycles"
+        "cycles",
+        "boolean"
       ]
     },
     {
-      "name": "599",
+      "name": "603",
       "members": [
         {
           "name": "unknown"
@@ -17883,7 +18004,7 @@
       ]
     },
     {
-      "name": "600",
+      "name": "604",
       "members": [
         {
           "name": "qcow2"
@@ -17907,47 +18028,47 @@
       ]
     },
     {
-      "name": "601",
+      "name": "605",
       "members": [
         {
           "name": "data",
-          "type": "657"
+          "type": "661"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "602",
+      "name": "606",
       "members": [
         {
           "name": "data",
-          "type": "658"
+          "type": "662"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "603",
+      "name": "607",
       "members": [
         {
           "name": "data",
-          "type": "659"
+          "type": "663"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "604",
+      "name": "608",
       "members": [
         {
           "name": "data",
-          "type": "660"
+          "type": "664"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "605",
+      "name": "609",
       "members": [
         {
           "name": "l1_update"
@@ -18147,7 +18268,7 @@
       ]
     },
     {
-      "name": "606",
+      "name": "610",
       "members": [
         {
           "name": "read"
@@ -18179,7 +18300,7 @@
       ]
     },
     {
-      "name": "607",
+      "name": "611",
       "members": [
         {
           "name": "inet"
@@ -18191,12 +18312,12 @@
       ]
     },
     {
-      "name": "608",
+      "name": "612",
       "members": [
         {
           "name": "template",
           "default": null,
-          "type": "609"
+          "type": "613"
         },
         {
           "name": "main-header",
@@ -18247,7 +18368,7 @@
       "meta-type": "object"
     },
     {
-      "name": "609",
+      "name": "613",
       "members": [
         {
           "name": "none"
@@ -18271,7 +18392,7 @@
       ]
     },
     {
-      "name": "610",
+      "name": "614",
       "members": [
         {
           "name": "aes"
@@ -18287,7 +18408,7 @@
       ]
     },
     {
-      "name": "611",
+      "name": "615",
       "members": [
         {
           "name": "key-secret",
@@ -18298,7 +18419,7 @@
       "meta-type": "object"
     },
     {
-      "name": "612",
+      "name": "616",
       "members": [
         {
           "name": "key-secret",
@@ -18309,7 +18430,7 @@
       "meta-type": "object"
     },
     {
-      "name": "613",
+      "name": "617",
       "members": [
         {
           "name": "aes"
@@ -18321,7 +18442,7 @@
       ]
     },
     {
-      "name": "614",
+      "name": "618",
       "members": [
         {
           "name": "luks"
@@ -18337,7 +18458,7 @@
       ]
     },
     {
-      "name": "615",
+      "name": "619",
       "members": [
         {
           "name": "key-secret",
@@ -18347,7 +18468,7 @@
       "meta-type": "object"
     },
     {
-      "name": "616",
+      "name": "620",
       "members": [
         {
           "name": "key-secret",
@@ -18357,7 +18478,7 @@
       "meta-type": "object"
     },
     {
-      "name": "617",
+      "name": "621",
       "members": [
         {
           "name": "none"
@@ -18377,11 +18498,11 @@
       ]
     },
     {
-      "name": "618",
+      "name": "622",
       "members": [
         {
           "name": "type",
-          "type": "661"
+          "type": "665"
         },
         {
           "name": "hash",
@@ -18391,7 +18512,7 @@
       "meta-type": "object"
     },
     {
-      "name": "619",
+      "name": "623",
       "members": [
         {
           "name": "off"
@@ -18415,7 +18536,7 @@
       ]
     },
     {
-      "name": "620",
+      "name": "624",
       "members": [
         {
           "name": "aes-128"
@@ -18471,7 +18592,7 @@
       ]
     },
     {
-      "name": "621",
+      "name": "625",
       "members": [
         {
           "name": "ecb"
@@ -18495,7 +18616,7 @@
       ]
     },
     {
-      "name": "622",
+      "name": "626",
       "members": [
         {
           "name": "plain"
@@ -18515,7 +18636,7 @@
       ]
     },
     {
-      "name": "623",
+      "name": "627",
       "members": [
         {
           "name": "md5"
@@ -18551,28 +18672,28 @@
       ]
     },
     {
-      "name": "624",
+      "name": "628",
       "tag": "format",
       "variants": [
         {
           "case": "qcow",
-          "type": "611"
+          "type": "615"
         },
         {
           "case": "luks",
-          "type": "663"
+          "type": "667"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "662"
+          "type": "666"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "625",
+      "name": "629",
       "members": [
         {
           "name": "v2"
@@ -18588,7 +18709,7 @@
       ]
     },
     {
-      "name": "626",
+      "name": "630",
       "members": [
         {
           "name": "zlib"
@@ -18604,28 +18725,28 @@
       ]
     },
     {
-      "name": "627",
+      "name": "631",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "664"
+          "type": "668"
         },
         {
           "case": "luks2",
-          "type": "665"
+          "type": "669"
         }
       ],
       "members": [
         {
           "name": "format",
-          "type": "614"
+          "type": "618"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "628",
+      "name": "632",
       "members": [
         {
           "name": "dynamic"
@@ -18641,7 +18762,7 @@
       ]
     },
     {
-      "name": "629",
+      "name": "633",
       "members": [
         {
           "name": "monolithicSparse"
@@ -18669,7 +18790,7 @@
       ]
     },
     {
-      "name": "630",
+      "name": "634",
       "members": [
         {
           "name": "ide"
@@ -18693,7 +18814,7 @@
       ]
     },
     {
-      "name": "631",
+      "name": "635",
       "members": [
         {
           "name": "dynamic"
@@ -18709,7 +18830,7 @@
       ]
     },
     {
-      "name": "632",
+      "name": "636",
       "members": [
         {
           "name": "active"
@@ -18725,12 +18846,12 @@
       ]
     },
     {
-      "name": "633",
+      "name": "637",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "666"
+          "type": "670"
         },
         {
           "case": "qcow",
@@ -18740,13 +18861,13 @@
       "members": [
         {
           "name": "format",
-          "type": "662"
+          "type": "666"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "634",
+      "name": "638",
       "members": [
         {
           "name": "logfile",
@@ -18776,7 +18897,7 @@
       "meta-type": "object"
     },
     {
-      "name": "635",
+      "name": "639",
       "members": [
         {
           "name": "logfile",
@@ -18796,7 +18917,7 @@
       "meta-type": "object"
     },
     {
-      "name": "636",
+      "name": "640",
       "members": [
         {
           "name": "logfile",
@@ -18810,7 +18931,7 @@
         },
         {
           "name": "addr",
-          "type": "316"
+          "type": "319"
         },
         {
           "name": "tls-creds",
@@ -18861,7 +18982,7 @@
       "meta-type": "object"
     },
     {
-      "name": "637",
+      "name": "641",
       "members": [
         {
           "name": "logfile",
@@ -18875,18 +18996,18 @@
         },
         {
           "name": "remote",
-          "type": "316"
+          "type": "319"
         },
         {
           "name": "local",
           "default": null,
-          "type": "316"
+          "type": "319"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "638",
+      "name": "642",
       "members": [
         {
           "name": "logfile",
@@ -18902,7 +19023,7 @@
       "meta-type": "object"
     },
     {
-      "name": "639",
+      "name": "643",
       "members": [
         {
           "name": "logfile",
@@ -18922,7 +19043,7 @@
       "meta-type": "object"
     },
     {
-      "name": "640",
+      "name": "644",
       "members": [
         {
           "name": "logfile",
@@ -18943,7 +19064,7 @@
       "meta-type": "object"
     },
     {
-      "name": "641",
+      "name": "645",
       "members": [
         {
           "name": "logfile",
@@ -18963,7 +19084,7 @@
       "meta-type": "object"
     },
     {
-      "name": "642",
+      "name": "646",
       "members": [
         {
           "name": "logfile",
@@ -18983,7 +19104,7 @@
       "meta-type": "object"
     },
     {
-      "name": "643",
+      "name": "647",
       "members": [
         {
           "name": "logfile",
@@ -19009,7 +19130,7 @@
       "meta-type": "object"
     },
     {
-      "name": "644",
+      "name": "648",
       "members": [
         {
           "name": "logfile",
@@ -19029,7 +19150,7 @@
       "meta-type": "object"
     },
     {
-      "name": "645",
+      "name": "649",
       "members": [
         {
           "name": "logfile",
@@ -19065,7 +19186,7 @@
       "meta-type": "object"
     },
     {
-      "name": "646",
+      "name": "650",
       "members": [
         {
           "name": "logfile",
@@ -19086,7 +19207,7 @@
       "meta-type": "object"
     },
     {
-      "name": "647",
+      "name": "651",
       "members": [
         {
           "name": "path",
@@ -19102,7 +19223,7 @@
       "meta-type": "object"
     },
     {
-      "name": "648",
+      "name": "652",
       "members": [
         {
           "name": "chardev",
@@ -19112,7 +19233,7 @@
       "meta-type": "object"
     },
     {
-      "name": "649",
+      "name": "653",
       "members": [
         {
           "name": "unmapped"
@@ -19720,11 +19841,11 @@
       ]
     },
     {
-      "name": "650",
+      "name": "654",
       "members": [
         {
           "name": "key",
-          "type": "365"
+          "type": "368"
         },
         {
           "name": "down",
@@ -19734,11 +19855,11 @@
       "meta-type": "object"
     },
     {
-      "name": "651",
+      "name": "655",
       "members": [
         {
           "name": "button",
-          "type": "667"
+          "type": "671"
         },
         {
           "name": "down",
@@ -19748,11 +19869,11 @@
       "meta-type": "object"
     },
     {
-      "name": "652",
+      "name": "656",
       "members": [
         {
           "name": "axis",
-          "type": "668"
+          "type": "672"
         },
         {
           "name": "value",
@@ -19762,7 +19883,7 @@
       "meta-type": "object"
     },
     {
-      "name": "653",
+      "name": "657",
       "members": [
         {
           "name": "persistent",
@@ -19773,13 +19894,13 @@
       "meta-type": "object"
     },
     {
-      "name": "654",
+      "name": "658",
       "members": [
       ],
       "meta-type": "object"
     },
     {
-      "name": "655",
+      "name": "659",
       "members": [
         {
           "name": "exact"
@@ -19795,7 +19916,7 @@
       ]
     },
     {
-      "name": "656",
+      "name": "660",
       "members": [
         {
           "name": "number",
@@ -19811,21 +19932,21 @@
         },
         {
           "name": "io_range",
-          "type": "669"
+          "type": "673"
         },
         {
           "name": "memory_range",
-          "type": "669"
+          "type": "673"
         },
         {
           "name": "prefetchable_range",
-          "type": "669"
+          "type": "673"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "657",
+      "name": "661",
       "members": [
         {
           "name": "compat",
@@ -19863,22 +19984,22 @@
         {
           "name": "encrypt",
           "default": null,
-          "type": "670"
+          "type": "674"
         },
         {
           "name": "bitmaps",
           "default": null,
-          "type": "[671]"
+          "type": "[675]"
         },
         {
           "name": "compression-type",
-          "type": "626"
+          "type": "630"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "658",
+      "name": "662",
       "members": [
         {
           "name": "create-type",
@@ -19894,34 +20015,34 @@
         },
         {
           "name": "extents",
-          "type": "[269]"
+          "type": "[272]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "659",
+      "name": "663",
       "members": [
         {
           "name": "cipher-alg",
-          "type": "620"
+          "type": "624"
         },
         {
           "name": "cipher-mode",
-          "type": "621"
+          "type": "625"
         },
         {
           "name": "ivgen-alg",
-          "type": "622"
+          "type": "626"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "623"
+          "type": "627"
         },
         {
           "name": "hash-alg",
-          "type": "623"
+          "type": "627"
         },
         {
           "name": "payload-offset",
@@ -19937,24 +20058,24 @@
         },
         {
           "name": "slots",
-          "type": "[672]"
+          "type": "[676]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "660",
+      "name": "664",
       "members": [
         {
           "name": "encryption-format",
           "default": null,
-          "type": "614"
+          "type": "618"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "661",
+      "name": "665",
       "members": [
         {
           "name": "md5"
@@ -19974,7 +20095,7 @@
       ]
     },
     {
-      "name": "662",
+      "name": "666",
       "members": [
         {
           "name": "qcow"
@@ -19990,7 +20111,7 @@
       ]
     },
     {
-      "name": "663",
+      "name": "667",
       "members": [
         {
           "name": "key-secret",
@@ -20000,27 +20121,27 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "620"
+          "type": "624"
         },
         {
           "name": "cipher-mode",
           "default": null,
-          "type": "621"
+          "type": "625"
         },
         {
           "name": "ivgen-alg",
           "default": null,
-          "type": "622"
+          "type": "626"
         },
         {
           "name": "ivgen-hash-alg",
           "default": null,
-          "type": "623"
+          "type": "627"
         },
         {
           "name": "hash-alg",
           "default": null,
-          "type": "623"
+          "type": "627"
         },
         {
           "name": "iter-time",
@@ -20031,7 +20152,7 @@
       "meta-type": "object"
     },
     {
-      "name": "664",
+      "name": "668",
       "members": [
         {
           "name": "key-secret",
@@ -20040,13 +20161,13 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "620"
+          "type": "624"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "665",
+      "name": "669",
       "members": [
         {
           "name": "key-secret",
@@ -20055,17 +20176,17 @@
         {
           "name": "cipher-alg",
           "default": null,
-          "type": "620"
+          "type": "624"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "666",
+      "name": "670",
       "members": [
         {
           "name": "state",
-          "type": "632"
+          "type": "636"
         },
         {
           "name": "new-secret",
@@ -20096,7 +20217,7 @@
       "meta-type": "object"
     },
     {
-      "name": "667",
+      "name": "671",
       "members": [
         {
           "name": "left"
@@ -20140,7 +20261,7 @@
       ]
     },
     {
-      "name": "668",
+      "name": "672",
       "members": [
         {
           "name": "x"
@@ -20156,7 +20277,7 @@
       ]
     },
     {
-      "name": "669",
+      "name": "673",
       "members": [
         {
           "name": "base",
@@ -20170,12 +20291,12 @@
       "meta-type": "object"
     },
     {
-      "name": "670",
+      "name": "674",
       "tag": "format",
       "variants": [
         {
           "case": "luks",
-          "type": "659"
+          "type": "663"
         },
         {
           "case": "aes",
@@ -20185,18 +20306,18 @@
       "members": [
         {
           "name": "format",
-          "type": "610"
+          "type": "614"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[671]",
-      "element-type": "671",
+      "name": "[675]",
+      "element-type": "675",
       "meta-type": "array"
     },
     {
-      "name": "671",
+      "name": "675",
       "members": [
         {
           "name": "name",
@@ -20208,23 +20329,23 @@
         },
         {
           "name": "flags",
-          "type": "[673]"
+          "type": "[677]"
         }
       ],
       "meta-type": "object"
     },
     {
-      "name": "[269]",
-      "element-type": "269",
+      "name": "[272]",
+      "element-type": "272",
       "meta-type": "array"
     },
     {
-      "name": "[672]",
-      "element-type": "672",
+      "name": "[676]",
+      "element-type": "676",
       "meta-type": "array"
     },
     {
-      "name": "672",
+      "name": "676",
       "members": [
         {
           "name": "active",
@@ -20248,12 +20369,12 @@
       "meta-type": "object"
     },
     {
-      "name": "[673]",
-      "element-type": "673",
+      "name": "[677]",
+      "element-type": "677",
       "meta-type": "array"
     },
     {
-      "name": "673",
+      "name": "677",
       "members": [
         {
           "name": "in-use"
@@ -20528,6 +20649,15 @@
     {
       "name": "snapshot-save"
     },
+    {
+      "name": "query-vcpu-dirty-limit"
+    },
+    {
+      "name": "cancel-vcpu-dirty-limit"
+    },
+    {
+      "name": "set-vcpu-dirty-limit"
+    },
     {
       "name": "query-dirty-rate"
     },
@@ -24817,6 +24947,12 @@
       "name": "max_io_size",
       "type": "uint64"
     },
+    {
+      "default-value": false,
+      "name": "quirk_mode_page_vendor_specific_apple",
+      "description": "on/off",
+      "type": "bool"
+    },
     {
       "default-value": 0,
       "name": "opt_io_size",
@@ -33848,6 +33984,10 @@
     {
       "state": false,
       "capability": "zero-copy-send"
+    },
+    {
+      "state": false,
+      "capability": "postcopy-preempt"
     }
   ],
   "id": "libvirt-49"
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 2b2f1aef52..2e30fc5f2e 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -246,7 +246,7 @@
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
-  <package>v7.0.0-2187-g2a8835cb45</package>
+  <package>v7.0.0-2780-g5288bee45f</package>
   <arch>x86_64</arch>
   <hostCPU type='kvm' model='base' migratability='yes'>
     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
-- 
2.36.1


From mprivozn at redhat.com  Fri Jul 22 14:21:45 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 22 Jul 2022 16:21:45 +0200
Subject: [PATCH] tests: qemucapabilities: Update test data for the
 qemu-7.1 cycle on x86_64
In-Reply-To: <8165923b0251d0d03550ba83eecbde4b1e9c197e.1658499361.git.pkrempa@redhat.com>
References: <8165923b0251d0d03550ba83eecbde4b1e9c197e.1658499361.git.pkrempa@redhat.com>
Message-ID: <91c98f7c-19f8-b7ed-151c-6cde9d8bb9e0@redhat.com>

On 7/22/22 16:16, Peter Krempa wrote:
> Update to v7.0.0-2780-g5288bee45f
> 
> Notable changes:
>  - set-vcpu-dirty-limit/cancel-vcpu-dirty-limit/query-vcpu-dirty-limit command added
>  - snapshot-save/snapshot-load command added
>  - dirty-sync-missed-zero-copy migration statistic added
>  - postcopy-preempt migration feature added
>  - the 'copy-before-write' block driver gained:
>     - 'cbw-timeout' property
>     - 'on-cbw-error' property with values:
>         - 'break-guest-write'
>         - 'break-snapshot'
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  .../caps_7.1.0.x86_64.replies                 | 2870 +++++++++--------
>  .../caps_7.1.0.x86_64.xml                     |    2 +-
>  2 files changed, 1506 insertions(+), 1366 deletions(-)

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From khanicov at redhat.com  Fri Jul 22 14:25:30 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 16:25:30 +0200
Subject: [PATCH 0/4] jobs: use virDomainObjResetJob()
Message-ID: <cover.1658499859.git.khanicov@redhat.com>

*** BLURB HERE ***

Kristina Hanicova (4):
  qemu & hypervisor: move qemuDomainObjResetJob() into hypervisor
  libxl: use virDomainObjResetJob()
  LXC: use virDomainObjResetJob()
  CH: use virDomainObjResetJob()

 src/ch/ch_domain.c          | 13 ++-----------
 src/hypervisor/domain_job.c |  9 +++++++++
 src/hypervisor/domain_job.h |  2 ++
 src/libvirt_private.syms    |  1 +
 src/libxl/libxl_domain.c    | 13 ++-----------
 src/lxc/lxc_domain.c        | 13 ++-----------
 src/qemu/qemu_domainjob.c   | 20 +++++---------------
 7 files changed, 23 insertions(+), 48 deletions(-)

-- 
2.35.3


From khanicov at redhat.com  Fri Jul 22 14:25:32 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 16:25:32 +0200
Subject: [PATCH 2/4] libxl: use virDomainObjResetJob()
In-Reply-To: <cover.1658499859.git.khanicov@redhat.com>
References: <cover.1658499859.git.khanicov@redhat.com>
Message-ID: <cabcc8b49ed784614aee5e5bf7a93ed53e7382f9.1658499859.git.khanicov@redhat.com>

This patch removes and replaces libxlDomainObjResetJob() with
general virDomainObjResetJob().

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/libxl/libxl_domain.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
index e2e078bd50..467c1ee914 100644
--- a/src/libxl/libxl_domain.c
+++ b/src/libxl/libxl_domain.c
@@ -44,15 +44,6 @@
 VIR_LOG_INIT("libxl.libxl_domain");
 
 
-static void
-libxlDomainObjResetJob(libxlDomainObjPrivate *priv)
-{
-    virDomainJobObj *job = &priv->job;
-
-    job->active = VIR_JOB_NONE;
-    job->owner = 0;
-}
-
 static void
 libxlDomainObjFreeJob(libxlDomainObjPrivate *priv)
 {
@@ -92,7 +83,7 @@ libxlDomainObjBeginJob(libxlDriverPrivate *driver G_GNUC_UNUSED,
             goto error;
     }
 
-    libxlDomainObjResetJob(priv);
+    virDomainObjResetJob(&priv->job);
 
     VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job));
     priv->job.active = job;
@@ -140,7 +131,7 @@ libxlDomainObjEndJob(libxlDriverPrivate *driver G_GNUC_UNUSED,
     VIR_DEBUG("Stopping job: %s",
               virDomainJobTypeToString(job));
 
-    libxlDomainObjResetJob(priv);
+    virDomainObjResetJob(&priv->job);
     virCondSignal(&priv->job.cond);
 }
 
-- 
2.35.3


From khanicov at redhat.com  Fri Jul 22 14:25:33 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 16:25:33 +0200
Subject: [PATCH 3/4] LXC: use virDomainObjResetJob()
In-Reply-To: <cover.1658499859.git.khanicov@redhat.com>
References: <cover.1658499859.git.khanicov@redhat.com>
Message-ID: <1d251234b073a3aef92dd45b665b893880803a91.1658499859.git.khanicov@redhat.com>

This patch removes and replaces virLXCDomainObjResetJob() with
general virDomainObjResetJob().

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/lxc/lxc_domain.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c
index fed4ae088a..6f048a128a 100644
--- a/src/lxc/lxc_domain.c
+++ b/src/lxc/lxc_domain.c
@@ -35,15 +35,6 @@
 
 VIR_LOG_INIT("lxc.lxc_domain");
 
-static void
-virLXCDomainObjResetJob(virLXCDomainObjPrivate *priv)
-{
-    virDomainJobObj *job = &priv->job;
-
-    job->active = VIR_JOB_NONE;
-    job->owner = 0;
-}
-
 static void
 virLXCDomainObjFreeJob(virLXCDomainObjPrivate *priv)
 {
@@ -82,7 +73,7 @@ virLXCDomainObjBeginJob(virLXCDriver *driver G_GNUC_UNUSED,
             goto error;
     }
 
-    virLXCDomainObjResetJob(priv);
+    virDomainObjResetJob(&priv->job);
 
     VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job));
     priv->job.active = job;
@@ -124,7 +115,7 @@ virLXCDomainObjEndJob(virLXCDriver *driver G_GNUC_UNUSED,
     VIR_DEBUG("Stopping job: %s",
               virDomainJobTypeToString(job));
 
-    virLXCDomainObjResetJob(priv);
+    virDomainObjResetJob(&priv->job);
     virCondSignal(&priv->job.cond);
 }
 
-- 
2.35.3


From khanicov at redhat.com  Fri Jul 22 14:25:31 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 16:25:31 +0200
Subject: [PATCH 1/4] qemu & hypervisor: move qemuDomainObjResetJob() into
 hypervisor
In-Reply-To: <cover.1658499859.git.khanicov@redhat.com>
References: <cover.1658499859.git.khanicov@redhat.com>
Message-ID: <effc7229f3a4b51452b07033357cabb940b60c26.1658499859.git.khanicov@redhat.com>

This patch moves qemuDomainObjResetJob() as
virDomainObjResetJob() into hypervisor in order to be used by
other hypervisors as well.

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/hypervisor/domain_job.c |  9 +++++++++
 src/hypervisor/domain_job.h |  2 ++
 src/libvirt_private.syms    |  1 +
 src/qemu/qemu_domainjob.c   | 20 +++++---------------
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/hypervisor/domain_job.c b/src/hypervisor/domain_job.c
index 1ee70ea11e..5b97624287 100644
--- a/src/hypervisor/domain_job.c
+++ b/src/hypervisor/domain_job.c
@@ -137,3 +137,12 @@ virDomainObjInitJob(virDomainJobObj *job,
 
     return 0;
 }
+
+void
+virDomainObjResetJob(virDomainJobObj *job)
+{
+    job->active = VIR_JOB_NONE;
+    job->owner = 0;
+    g_clear_pointer(&job->ownerAPI, g_free);
+    job->started = 0;
+}
diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index 7c65c4f8cd..4c32296117 100644
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -208,3 +208,5 @@ struct _virDomainObjPrivateJobCallbacks {
 
 int virDomainObjInitJob(virDomainJobObj *job,
                         virDomainObjPrivateJobCallbacks *cb);
+
+void virDomainObjResetJob(virDomainJobObj *job);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6a5c5600df..d5046604dd 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1591,6 +1591,7 @@ virDomainJobStatusToType;
 virDomainJobTypeFromString;
 virDomainJobTypeToString;
 virDomainObjInitJob;
+virDomainObjResetJob;
 
 
 # hypervisor/virclosecallbacks.h
diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 74ea975e44..a45103256a 100644
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -150,16 +150,6 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver,
 }
 
 
-static void
-qemuDomainObjResetJob(virDomainJobObj *job)
-{
-    job->active = VIR_JOB_NONE;
-    job->owner = 0;
-    g_clear_pointer(&job->ownerAPI, g_free);
-    job->started = 0;
-}
-
-
 static void
 qemuDomainObjResetAgentJob(virDomainJobObj *job)
 {
@@ -219,7 +209,7 @@ qemuDomainObjPreserveJob(virDomainObj *obj,
         return -1;
     job->cb = priv->job.cb;
 
-    qemuDomainObjResetJob(&priv->job);
+    virDomainObjResetJob(&priv->job);
     qemuDomainObjResetAsyncJob(&priv->job);
     return 0;
 }
@@ -263,7 +253,7 @@ qemuDomainObjRestoreAsyncJob(virDomainObj *vm,
 void
 qemuDomainObjClearJob(virDomainJobObj *job)
 {
-    qemuDomainObjResetJob(job);
+    virDomainObjResetJob(job);
     qemuDomainObjResetAsyncJob(job);
     g_clear_pointer(&job->current, virDomainJobDataFree);
     g_clear_pointer(&job->completed, virDomainJobDataFree);
@@ -772,7 +762,7 @@ qemuDomainObjDiscardAsyncJob(virDomainObj *obj)
     qemuDomainObjPrivate *priv = obj->privateData;
 
     if (priv->job.active == VIR_JOB_ASYNC_NESTED)
-        qemuDomainObjResetJob(&priv->job);
+        virDomainObjResetJob(&priv->job);
     qemuDomainObjResetAsyncJob(&priv->job);
     qemuDomainSaveStatus(obj);
 }
@@ -919,7 +909,7 @@ qemuDomainObjBeginJobInternal(virQEMUDriver *driver,
     ignore_value(virTimeMillisNow(&now));
 
     if (job) {
-        qemuDomainObjResetJob(&priv->job);
+        virDomainObjResetJob(&priv->job);
 
         if (job != VIR_JOB_ASYNC) {
             VIR_DEBUG("Started job: %s (async=%s vm=%p name=%s)",
@@ -1180,7 +1170,7 @@ qemuDomainObjEndJob(virDomainObj *obj)
               virDomainAsyncJobTypeToString(priv->job.asyncJob),
               obj, obj->def->name);
 
-    qemuDomainObjResetJob(&priv->job);
+    virDomainObjResetJob(&priv->job);
     if (qemuDomainTrackJob(job))
         qemuDomainSaveStatus(obj);
     /* We indeed need to wake up ALL threads waiting because
-- 
2.35.3


From khanicov at redhat.com  Fri Jul 22 14:25:34 2022
From: khanicov at redhat.com (Kristina Hanicova)
Date: Fri, 22 Jul 2022 16:25:34 +0200
Subject: [PATCH 4/4] CH: use virDomainObjResetJob()
In-Reply-To: <cover.1658499859.git.khanicov@redhat.com>
References: <cover.1658499859.git.khanicov@redhat.com>
Message-ID: <9fb548c84826d249b951be89e16518e7ccb29f42.1658499859.git.khanicov@redhat.com>

This patch removes and replaces virCHDomainObjResetJob() with
general virDomainObjResetJob().

Signed-off-by: Kristina Hanicova <khanicov at redhat.com>
---
 src/ch/ch_domain.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index ae53c6fe05..499d31cf4a 100644
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -32,15 +32,6 @@
 
 VIR_LOG_INIT("ch.ch_domain");
 
-static void
-virCHDomainObjResetJob(virCHDomainObjPrivate *priv)
-{
-    virDomainJobObj *job = &priv->job;
-
-    job->active = VIR_JOB_NONE;
-    job->owner = 0;
-}
-
 static void
 virCHDomainObjFreeJob(virCHDomainObjPrivate *priv)
 {
@@ -88,7 +79,7 @@ virCHDomainObjBeginJob(virDomainObj *obj, virDomainJob job)
         }
     }
 
-    virCHDomainObjResetJob(priv);
+    virDomainObjResetJob(&priv->job);
 
     VIR_DEBUG("Starting job: %s", virDomainJobTypeToString(job));
     priv->job.active = job;
@@ -112,7 +103,7 @@ virCHDomainObjEndJob(virDomainObj *obj)
     VIR_DEBUG("Stopping job: %s",
               virDomainJobTypeToString(job));
 
-    virCHDomainObjResetJob(priv);
+    virDomainObjResetJob(&priv->job);
     virCondSignal(&priv->job.cond);
 }
 
-- 
2.35.3


From mkletzan at redhat.com  Fri Jul 22 14:26:36 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Fri, 22 Jul 2022 16:26:36 +0200
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <20220714055204.1277661-2-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-2-natto@weirdnatto.in>
Message-ID: <YtqznFGW2j2xbcnP@wheatley>

On Thu, Jul 14, 2022 at 11:22:02AM +0530, Amneesh Singh wrote:
>Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
>This patch adds an API for the "query-stats" QMP command.
>
>The query returns a JSON containing the statistics based on the target,
>which can either be vCPU or VM, and the providers. The API deserializes
>the query result into an array of GHashMaps, which can later be used to
>extract all the query statistics. GHashMaps are used to avoid traversing
>the entire array to find the statistics you are looking for. This would
>be a singleton array if the target is a VM since the returned JSON is
>also a singleton array in that case.
>
>Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>---
> src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
> src/qemu/qemu_monitor.h      |  45 ++++++++++++
> src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
> src/qemu/qemu_monitor_json.h |   6 ++
> 4 files changed, 251 insertions(+)
>
>diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
>index fda5d2f3..a07e6017 100644
>--- a/src/qemu/qemu_monitor.c
>+++ b/src/qemu/qemu_monitor.c
>@@ -4541,3 +4541,73 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
>
>     return qemuMonitorJSONMigrateRecover(mon, uri);
> }
>+
>+VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
>+              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
>+              "vm",
>+              "vcpu",
>+);
>+
>+VIR_ENUM_IMPL(qemuMonitorQueryStatsName,
>+              QEMU_MONITOR_QUERY_STATS_NAME_LAST,
>+              "halt_poll_success_ns",
>+              "halt_poll_fail_ns"
>+);
>+
>+VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
>+              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
>+              "kvm",
>+);
>+
>+void
>+qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
>+{
>+    virBitmapFree(provider->names);
>+    g_free(provider);
>+}
>+
>+qemuMonitorQueryStatsProvider *
>+qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType provider_type,
>+                                 ...)
>+{
>+    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
>+    qemuMonitorQueryStatsNameType stat;
>+    va_list name_list;
>+    size_t sentinel = QEMU_MONITOR_QUERY_STATS_NAME_LAST;
>+
>+    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
>+    provider->provider = provider_type;
>+    provider->names = NULL;
>+
>+    va_start(name_list, provider_type);
>+    stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
>+
>+    if (stat != sentinel) {
>+        provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
>+

It is very unlikely to happen to just get passed an empty set of names, and even
in that case it would not cause any issues to have an empty virBitmap.  I'd just
allocate it in any case to make the code nicer.

Also it would not crash in QueryStats when searching for the set bits.

>+        while (stat != sentinel) {
>+            if (virBitmapSetBit(provider->names, stat) < 0)
>+                return NULL;
>+            stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
>+        }
>+    }
>+    va_end(name_list);
>+
>+    return g_steal_pointer(&provider);
>+}
>+
>diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
>index 80696de7..4e228bfb 100644
>--- a/src/qemu/qemu_monitor_json.c
>+++ b/src/qemu/qemu_monitor_json.c
>@@ -9031,3 +9031,133 @@ qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
>
>     return qemuMonitorJSONCheckError(cmd, reply);
> }
>+
>+static GPtrArray *
>+qemuMonitorJSONExtractQueryStats(virJSONValue *arr)
>+{
>+    g_autoptr(GPtrArray) queried_stats = NULL;
>+    size_t nstats = virJSONValueArraySize(arr);
>+    size_t i;
>+
>+    /* Create a GPtrArray for GHashTables */
>+    queried_stats = g_ptr_array_new_full(nstats, (GDestroyNotify) g_hash_table_destroy);
>+
>+    for (i = 0; i < nstats; i++) {
>+        virJSONValue *obj = virJSONValueArrayGet(arr, i);
>+        virJSONValue *stats = virJSONValueObjectGetArray(obj, "stats");
>+        size_t j;
>+
>+        /* Create a GHashTable for virJSONValues */
>+        GHashTable *hash_table = virHashNew((GDestroyNotify) virJSONValueFree);
>+
>+        for (j = 0; j < virJSONValueArraySize(stats); j++) {
>+            virJSONValue *stat = virJSONValueArrayGet(stats, j);
>+
>+            g_hash_table_insert(hash_table,
>+                                g_strdup(virJSONValueObjectGetString(stat, "name")),
>+                                virJSONValueObjectGet(stat, "value"));

Similarly to the other checks we should also check these virJSONObjectGet*
functions do not return NULL, just in case.  The reasoning behind it is that we
definitely do not want a (possibly exploited) qemu to be able to crash libvirt.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/995ad89b/attachment-0001.sig>

From mkletzan at redhat.com  Fri Jul 22 14:32:18 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Fri, 22 Jul 2022 16:32:18 +0200
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <CAJEdO+3rm1VcGfh7gYNntSAzf4vDm-RceaUdoXe-RZC2+DuEWg@mail.gmail.com>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-2-natto@weirdnatto.in>
 <CAJEdO+3rm1VcGfh7gYNntSAzf4vDm-RceaUdoXe-RZC2+DuEWg@mail.gmail.com>
Message-ID: <Ytq08lTngJt3Mcox@wheatley>

On Fri, Jul 22, 2022 at 02:44:30PM +0200, Kristina Hanicova wrote:
>On Thu, Jul 14, 2022 at 7:54 AM Amneesh Singh <natto at weirdnatto.in> wrote:
>
>> Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>>
>> This patch adds an API for the "query-stats" QMP command.
>>
>> The query returns a JSON containing the statistics based on the target,
>> which can either be vCPU or VM, and the providers. The API deserializes
>> the query result into an array of GHashMaps, which can later be used to
>> extract all the query statistics. GHashMaps are used to avoid traversing
>> the entire array to find the statistics you are looking for. This would
>> be a singleton array if the target is a VM since the returned JSON is
>> also a singleton array in that case.
>>
>> Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>> ---
>>  src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
>>  src/qemu/qemu_monitor.h      |  45 ++++++++++++
>>  src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
>>  src/qemu/qemu_monitor_json.h |   6 ++
>>  4 files changed, 251 insertions(+)
>>

[...]

>> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
>> index 95267ec6..344636e1 100644
>> --- a/src/qemu/qemu_monitor.h
>> +++ b/src/qemu/qemu_monitor.h
>> @@ -1554,3 +1554,48 @@ qemuMonitorChangeMemoryRequestedSize(qemuMonitor
>> *mon,
>>  int
>>  qemuMonitorMigrateRecover(qemuMonitor *mon,
>>                            const char *uri);
>> +
>> +typedef enum {
>> +    QEMU_MONITOR_QUERY_STATS_TARGET_VM,
>> +    QEMU_MONITOR_QUERY_STATS_TARGET_VCPU,
>> +    QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
>> +} qemuMonitorQueryStatsTargetType;
>> +
>> +VIR_ENUM_DECL(qemuMonitorQueryStatsTarget);
>> +
>> +typedef enum {
>> +    QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS,
>> +    QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS,
>> +    QEMU_MONITOR_QUERY_STATS_NAME_LAST,
>> +} qemuMonitorQueryStatsNameType;
>> +
>> +VIR_ENUM_DECL(qemuMonitorQueryStatsName);
>> +
>> +typedef enum {
>> +    QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
>> +    QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
>> +} qemuMonitorQueryStatsProviderType;
>> +
>> +VIR_ENUM_DECL(qemuMonitorQueryStatsProvider);
>> +
>> +typedef struct _qemuMonitorQueryStatsProvider
>> qemuMonitorQueryStatsProvider;
>> +struct _qemuMonitorQueryStatsProvider {
>> +    qemuMonitorQueryStatsProviderType provider;
>>
>
>It is a bit confusing for me to have a variable 'provider' in the
>'provider' structure.
>Later you use provider->provider which is not very readable.
>I would prefer 'type' (maybe even 'providerType') instead.
>

I think I suggested `type` in previous review.

I'll fix this up and the other comments (mine as well) before pushing unless
there is something bigger in the last patch.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/c120ce4b/attachment.sig>

From mprivozn at redhat.com  Fri Jul 22 14:36:22 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 22 Jul 2022 16:36:22 +0200
Subject: [libvirt PATCH 0/3] qemu: Allow IOMMU devices to have aliases
In-Reply-To: <20220721093229.91273-1-abologna@redhat.com>
References: <20220721093229.91273-1-abologna@redhat.com>
Message-ID: <510d101b-ace5-b773-45ae-10dc861010f5@redhat.com>

On 7/21/22 11:32, Andrea Bolognani wrote:
> 
> 
> Andrea Bolognani (3):
>   schema: Allow IOMMU devices to have aliases
>   qemu: Assign default alias to IOMMU devices
>   qemu: Add IOMMU device alias to command line
> 
>  src/conf/schemas/domaincommon.rng                      |  3 +++
>  src/qemu/qemu_alias.c                                  | 10 ++++++++++
>  src/qemu/qemu_command.c                                |  2 ++
>  .../intel-iommu-aw-bits.x86_64-latest.args             |  2 +-
>  .../intel-iommu-caching-mode.x86_64-latest.args        |  2 +-
>  .../intel-iommu-device-iotlb.x86_64-latest.args        |  2 +-
>  .../intel-iommu-eim.x86_64-latest.args                 |  2 +-
>  tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args  |  2 +-
>  .../virtio-iommu-aarch64.aarch64-latest.args           |  2 +-
>  .../virtio-iommu-x86_64.x86_64-latest.args             |  2 +-
>  10 files changed, 22 insertions(+), 7 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From jjongsma at redhat.com  Fri Jul 22 14:40:34 2022
From: jjongsma at redhat.com (Jonathon Jongsma)
Date: Fri, 22 Jul 2022 09:40:34 -0500
Subject: [PATCH 0/4] jobs: use virDomainObjResetJob()
In-Reply-To: <cover.1658499859.git.khanicov@redhat.com>
References: <cover.1658499859.git.khanicov@redhat.com>
Message-ID: <6b432dab-fdc4-8ff1-f492-59ef83fc0dbf@redhat.com>

Reviewed-by: Jonathon Jongsma <jjongsma at redhat.com>

On 7/22/22 9:25 AM, Kristina Hanicova wrote:
> *** BLURB HERE ***
> 
> Kristina Hanicova (4):
>    qemu & hypervisor: move qemuDomainObjResetJob() into hypervisor
>    libxl: use virDomainObjResetJob()
>    LXC: use virDomainObjResetJob()
>    CH: use virDomainObjResetJob()
> 
>   src/ch/ch_domain.c          | 13 ++-----------
>   src/hypervisor/domain_job.c |  9 +++++++++
>   src/hypervisor/domain_job.h |  2 ++
>   src/libvirt_private.syms    |  1 +
>   src/libxl/libxl_domain.c    | 13 ++-----------
>   src/lxc/lxc_domain.c        | 13 ++-----------
>   src/qemu/qemu_domainjob.c   | 20 +++++---------------
>   7 files changed, 23 insertions(+), 48 deletions(-)
> 



From mkletzan at redhat.com  Fri Jul 22 14:43:25 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Fri, 22 Jul 2022 16:43:25 +0200
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <20220714055204.1277661-2-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-2-natto@weirdnatto.in>
Message-ID: <Ytq3jcl7EvO8GlFh@wheatley>

On Thu, Jul 14, 2022 at 11:22:02AM +0530, Amneesh Singh wrote:
>Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
>This patch adds an API for the "query-stats" QMP command.
>
>The query returns a JSON containing the statistics based on the target,
>which can either be vCPU or VM, and the providers. The API deserializes
>the query result into an array of GHashMaps, which can later be used to
>extract all the query statistics. GHashMaps are used to avoid traversing
>the entire array to find the statistics you are looking for. This would
>be a singleton array if the target is a VM since the returned JSON is
>also a singleton array in that case.
>
>Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>---
> src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
> src/qemu/qemu_monitor.h      |  45 ++++++++++++
> src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
> src/qemu/qemu_monitor_json.h |   6 ++
> 4 files changed, 251 insertions(+)
>
>diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
>index 80696de7..4e228bfb 100644
>--- a/src/qemu/qemu_monitor_json.c
>+++ b/src/qemu/qemu_monitor_json.c
>@@ -9031,3 +9031,133 @@ qemuMonitorJSONMigrateRecover(qemuMonitor *mon,
>
>     return qemuMonitorJSONCheckError(cmd, reply);
> }
>+
>+static GPtrArray *
>+qemuMonitorJSONExtractQueryStats(virJSONValue *arr)
>+{
>+    g_autoptr(GPtrArray) queried_stats = NULL;
>+    size_t nstats = virJSONValueArraySize(arr);
>+    size_t i;
>+
>+    /* Create a GPtrArray for GHashTables */
>+    queried_stats = g_ptr_array_new_full(nstats, (GDestroyNotify) g_hash_table_destroy);
>+
>+    for (i = 0; i < nstats; i++) {
>+        virJSONValue *obj = virJSONValueArrayGet(arr, i);
>+        virJSONValue *stats = virJSONValueObjectGetArray(obj, "stats");
>+        size_t j;
>+
>+        /* Create a GHashTable for virJSONValues */
>+        GHashTable *hash_table = virHashNew((GDestroyNotify) virJSONValueFree);
>+
>+        for (j = 0; j < virJSONValueArraySize(stats); j++) {
>+            virJSONValue *stat = virJSONValueArrayGet(stats, j);
>+
>+            g_hash_table_insert(hash_table,
>+                                g_strdup(virJSONValueObjectGetString(stat, "name")),
>+                                virJSONValueObjectGet(stat, "value"));
>+        }
>+
>+        g_ptr_array_add(queried_stats, hash_table);
>+    }
>+
>+    return g_steal_pointer(&queried_stats);
>+}
>+
>+
>+/**
>+ * qemuMonitorJSONQueryStats:
>+ * @mon: monitor object
>+ * @target: the target type for the query
>+ * @vcpus: a list of vCPU QOM paths for filtering the statistics
>+ * @providers: an array of providers to filter statistics
>+ *
>+ * @vcpus is a NULL terminated array of strings. @providers is a GPtrArray
>+ * for qemuMonitorQueryStatsProvider.
>+ * @vcpus and @providers are optional and can be NULL.
>+ *
>+ * Queries for the @target based statistics.
>+ * Returns a GPtrArray of GHashTables containing the statistics on success or
>+ * NULL on failure.
>+ */
>+
>+GPtrArray *
>+qemuMonitorJSONQueryStats(qemuMonitor *mon,
>+                          qemuMonitorQueryStatsTargetType target,
>+                          char **vcpus,
>+                          GPtrArray *providers)
>+{
>+    g_autoptr(virJSONValue) cmd = NULL;
>+    g_autoptr(virJSONValue) reply = NULL;
>+    g_autoptr(virJSONValue) vcpu_list = NULL;
>+    g_autoptr(virJSONValue) provider_list = NULL;
>+    virJSONValue *rv = NULL;
>+
>+    size_t i;
>+
>+    if (providers) {
>+        provider_list = virJSONValueNewArray();
>+
>+        for (i = 0; i < providers->len; i++) {
>+            g_autoptr(virJSONValue) provider_obj = virJSONValueNewObject();
>+            qemuMonitorQueryStatsProvider *provider = providers->pdata[i];
>+            const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->provider);
>+            virBitmap *names = provider->names;
>+            int rc;
>+
>+            rc = virJSONValueObjectAppendString(provider_obj, "provider", type_str);
>+
>+            if (rc < 0)
>+                return NULL;
>+
>+            if (names) {
>+                g_autoptr(virJSONValue) provider_names = virJSONValueNewArray();
>+                int curBit = virBitmapNextSetBit(names, -1);
>+
>+                while (curBit >= 0) {
>+                    const char *name = qemuMonitorQueryStatsNameTypeToString(curBit);
>+
>+                    if (virJSONValueArrayAppendString(provider_names, name) < 0)
>+                        return NULL;
>+
>+                    curBit = virBitmapNextSetBit(names, curBit);
>+                }

Also this can be shorter with:

int curBit = -1;

while ((curBit = virBitmapNextSetBit(names, curBit)) != -1) {
    ...
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/463a8ee6/attachment.sig>

From mkletzan at redhat.com  Fri Jul 22 15:02:06 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Fri, 22 Jul 2022 17:02:06 +0200
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <CAJEdO+3rm1VcGfh7gYNntSAzf4vDm-RceaUdoXe-RZC2+DuEWg@mail.gmail.com>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-2-natto@weirdnatto.in>
 <CAJEdO+3rm1VcGfh7gYNntSAzf4vDm-RceaUdoXe-RZC2+DuEWg@mail.gmail.com>
Message-ID: <Ytq77sNRu1qk3SR8@wheatley>

On Fri, Jul 22, 2022 at 02:44:30PM +0200, Kristina Hanicova wrote:
>On Thu, Jul 14, 2022 at 7:54 AM Amneesh Singh <natto at weirdnatto.in> wrote:
>
>> Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>>
>> This patch adds an API for the "query-stats" QMP command.
>>
>> The query returns a JSON containing the statistics based on the target,
>> which can either be vCPU or VM, and the providers. The API deserializes
>> the query result into an array of GHashMaps, which can later be used to
>> extract all the query statistics. GHashMaps are used to avoid traversing
>> the entire array to find the statistics you are looking for. This would
>> be a singleton array if the target is a VM since the returned JSON is
>> also a singleton array in that case.
>>
>> Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>> ---
>>  src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
>>  src/qemu/qemu_monitor.h      |  45 ++++++++++++
>>  src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
>>  src/qemu/qemu_monitor_json.h |   6 ++
>>  4 files changed, 251 insertions(+)
>>
>> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
>> index fda5d2f3..a07e6017 100644
>> --- a/src/qemu/qemu_monitor.c
>> +++ b/src/qemu/qemu_monitor.c
>> @@ -4541,3 +4541,73 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
>>
>>      return qemuMonitorJSONMigrateRecover(mon, uri);
>>  }
>> +
>> +VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
>> +              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
>> +              "vm",
>> +              "vcpu",
>> +);
>> +
>> +VIR_ENUM_IMPL(qemuMonitorQueryStatsName,
>> +              QEMU_MONITOR_QUERY_STATS_NAME_LAST,
>> +              "halt_poll_success_ns",
>> +              "halt_poll_fail_ns"
>> +);
>> +
>> +VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
>> +              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
>> +              "kvm",
>> +);
>> +
>> +void
>> +qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
>> +{
>> +    virBitmapFree(provider->names);
>> +    g_free(provider);
>> +}
>> +
>> +qemuMonitorQueryStatsProvider *
>> +qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType
>> provider_type,
>> +                                 ...)
>> +{
>> +    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
>> +    qemuMonitorQueryStatsNameType stat;
>> +    va_list name_list;
>> +    size_t sentinel = QEMU_MONITOR_QUERY_STATS_NAME_LAST;
>> +
>> +    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
>> +    provider->provider = provider_type;
>> +    provider->names = NULL;
>> +
>> +    va_start(name_list, provider_type);
>> +    stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
>> +
>> +    if (stat != sentinel) {
>>
>
>It would be better to compare 'stat' with QEMU_MONITOR_QUERY_STATS_NAME_LAST
>directly without the additional variable 'sentinel'.
>
>
>> +        provider->names =
>> virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
>> +
>> +        while (stat != sentinel) {
>>
>
>Same here.
>
>
>This while cycle would be better outside the if case, such as:
>
>if (stat != sentinel)
>    provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
>
>while (stat != sentinel) {
>    ....
>}
>
>Because the 'while' cycle has the same condition as the 'if' case.
>
>
>> +            if (virBitmapSetBit(provider->names, stat) < 0)
>> +                return NULL;
>> +            stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
>> +        }
>> +    }
>> +    va_end(name_list);
>> +
>> +    return g_steal_pointer(&provider);
>> +}

Sorry for so many review e-mails from me on this one patch, but while fixing few
of the nitpicks I managed to rewrite the function quite a bit:

     qemuMonitorQueryStatsProvider *provider = g_new0(qemuMonitorQueryStatsProvider, 1);
     qemuMonitorQueryStatsNameType stat;
     va_list name_list;

     /*
      * This can be lowered later in case of the enum getting quite large, hence
      *  the virBitmapSetExpand below.
      */
     provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
     provider->type = provider_type;

     va_start(name_list, provider_type);

     while ((stat = va_arg(name_list, qemuMonitorQueryStatsNameType)) !=
            QEMU_MONITOR_QUERY_STATS_NAME_LAST)
         virBitmapSetBitExpand(provider->names, stat);

     va_end(name_list);

     return provider;

Let me know (both of you) if you are okay with me using this version.

Thanks
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/c3cb0ea5/attachment-0001.sig>

From jdenemar at redhat.com  Fri Jul 22 15:08:57 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 22 Jul 2022 17:08:57 +0200
Subject: [libvirt PATCH 0/3] qemu: Properly reset migration parameters on
 reconnect
Message-ID: <cover.1658502471.git.jdenemar@redhat.com>

https://bugzilla.redhat.com/show_bug.cgi?id=2107892

Jiri Denemark (3):
  qemu_migration: Store original migration params in status XML
  qemu_migration_params: Refactor qemuMigrationParamsApply
  qemu_migration_params: Refactor qemuMigrationParamsReset

 src/qemu/qemu_migration.c        |  6 +++
 src/qemu/qemu_migration_params.c | 69 +++++++++++++++++++++++---------
 2 files changed, 55 insertions(+), 20 deletions(-)

-- 
2.35.1


From jdenemar at redhat.com  Fri Jul 22 15:09:00 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 22 Jul 2022 17:09:00 +0200
Subject: [libvirt PATCH 3/3] qemu_migration_params: Refactor
 qemuMigrationParamsReset
In-Reply-To: <cover.1658502471.git.jdenemar@redhat.com>
References: <cover.1658502471.git.jdenemar@redhat.com>
Message-ID: <48011c976a31d514f5bebfbe3f2fa7f6c736afef.1658502471.git.jdenemar@redhat.com>

Because qemuMigrationParamsReset used to call qemuMigrationParamsApply
for resetting migration capabilities and parameters, it did not work
well since commit v5.1.0-83-ga1dec315c9 which only allowed capabilities
to be set from an async job. However, when reconnecting to running
domains after daemon restart we do not have an async job. Thus the
capabilities were not properly reset in case the daemon was restarted
during an ongoing migration. We need to avoid calling
qemuMigrationParamsApply to make sure both parameters and capabilities
can be reset by a normal job.

https://bugzilla.redhat.com/show_bug.cgi?id=2107892

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration_params.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index dcfb30b56f..be7966a18a 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -1290,6 +1290,7 @@ qemuMigrationParamsReset(virQEMUDriver *driver,
                          unsigned long apiFlags)
 {
     virErrorPtr err;
+    g_autoptr(virBitmap) clearCaps = NULL;
 
     virErrorPreserveLast(&err);
 
@@ -1299,13 +1300,16 @@ qemuMigrationParamsReset(virQEMUDriver *driver,
     if (!virDomainObjIsActive(vm) || !origParams)
         goto cleanup;
 
-    /* Do not pass apiFlags to qemuMigrationParamsApply here to make sure all
-     * parameters and capabilities are reset. */
-    if (qemuMigrationParamsApply(driver, vm, asyncJob, origParams, 0) < 0)
+    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
         goto cleanup;
 
-    qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags);
-    /* We don't reset 'block-bitmap-mapping' as it can't be unset */
+    clearCaps = virBitmapNew(0);
+
+    if (qemuMigrationParamsApplyCaps(vm, clearCaps) == 0 &&
+        qemuMigrationParamsApplyValues(vm, origParams, false) == 0)
+        qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags);
+
+    qemuDomainObjExitMonitor(vm);
 
  cleanup:
     virErrorRestore(&err);
-- 
2.35.1


From jdenemar at redhat.com  Fri Jul 22 15:08:58 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 22 Jul 2022 17:08:58 +0200
Subject: [libvirt PATCH 1/3] qemu_migration: Store original migration params
 in status XML
In-Reply-To: <cover.1658502471.git.jdenemar@redhat.com>
References: <cover.1658502471.git.jdenemar@redhat.com>
Message-ID: <f8ac7ed707ff3fe634347d907b25ff75e98b8d44.1658502471.git.jdenemar@redhat.com>

We keep original values of migration parameters so that we can restore
them at the end of migration to make sure later migration does not use
some random values. However, this does not really work when libvirt
daemon is restarted on the source host because we failed to explicitly
save the status XML after getting the migration parameters from QEMU.
Actually it might work if the status XML is written later for some other
reason such as domain state change, but that's not how it should work.

https://bugzilla.redhat.com/show_bug.cgi?id=2107892

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 20dc91f1ce..769b818f66 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3245,6 +3245,9 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver,
                                  migParams, mig->caps->automatic) < 0)
         goto error;
 
+    /* Save original migration parameters */
+    qemuDomainSaveStatus(vm);
+
     /* Migrations using TLS need to add the "tls-creds-x509" object and
      * set the migration TLS parameters */
     if (flags & VIR_MIGRATE_TLS) {
@@ -4821,6 +4824,9 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
                                  migParams, mig->caps->automatic) < 0)
         goto error;
 
+    /* Save original migration parameters */
+    qemuDomainSaveStatus(vm);
+
     if (flags & VIR_MIGRATE_TLS) {
         const char *hostname = NULL;
 
-- 
2.35.1


From jdenemar at redhat.com  Fri Jul 22 15:08:59 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 22 Jul 2022 17:08:59 +0200
Subject: [libvirt PATCH 2/3] qemu_migration_params: Refactor
 qemuMigrationParamsApply
In-Reply-To: <cover.1658502471.git.jdenemar@redhat.com>
References: <cover.1658502471.git.jdenemar@redhat.com>
Message-ID: <acb86b835b6222cc0933773c46f46f4e686f5d03.1658502471.git.jdenemar@redhat.com>

qemuMigrationParamsApply restricts when capabilities can be set, but
this is not useful in all cases. Let's create new helpers for setting
migration capabilities and parameters which can be reused in more places
without the restriction.

https://bugzilla.redhat.com/show_bug.cgi?id=2107892

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration_params.c | 55 +++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 1fd0c55905..dcfb30b56f 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -864,6 +864,43 @@ qemuMigrationCapsToJSON(virBitmap *caps,
 }
 
 
+static int
+qemuMigrationParamsApplyCaps(virDomainObj *vm,
+                             virBitmap *states)
+{
+    qemuDomainObjPrivate *priv = vm->privateData;
+    g_autoptr(virJSONValue) json = NULL;
+
+    if (!(json = qemuMigrationCapsToJSON(priv->migrationCaps, states)))
+        return -1;
+
+    if (virJSONValueArraySize(json) > 0 &&
+        qemuMonitorSetMigrationCapabilities(priv->mon, &json) < 0)
+        return -1;
+
+    return 0;
+}
+
+
+static int
+qemuMigrationParamsApplyValues(virDomainObj *vm,
+                               qemuMigrationParams *params,
+                               bool postcopyResume)
+{
+    qemuDomainObjPrivate *priv = vm->privateData;
+    g_autoptr(virJSONValue) json = NULL;
+
+    if (!(json = qemuMigrationParamsToJSON(params, postcopyResume)))
+        return -1;
+
+    if (virJSONValueObjectKeysNumber(json) > 0 &&
+        qemuMonitorSetMigrationParams(priv->mon, &json) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 /**
  * qemuMigrationParamsApply
  * @driver: qemu driver
@@ -885,9 +922,6 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
                          qemuMigrationParams *migParams,
                          unsigned long apiFlags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-    g_autoptr(virJSONValue) params = NULL;
-    g_autoptr(virJSONValue) caps = NULL;
     bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME);
     int ret = -1;
 
@@ -905,21 +939,12 @@ qemuMigrationParamsApply(virQEMUDriver *driver,
                                  "a migration job"));
                 goto cleanup;
             }
-        } else {
-            if (!(caps = qemuMigrationCapsToJSON(priv->migrationCaps, migParams->caps)))
-                goto cleanup;
-
-            if (virJSONValueArraySize(caps) > 0 &&
-                qemuMonitorSetMigrationCapabilities(priv->mon, &caps) < 0)
-                goto cleanup;
+        } else if (qemuMigrationParamsApplyCaps(vm, migParams->caps) < 0) {
+            goto cleanup;
         }
     }
 
-    if (!(params = qemuMigrationParamsToJSON(migParams, postcopyResume)))
-        goto cleanup;
-
-    if (virJSONValueObjectKeysNumber(params) > 0 &&
-        qemuMonitorSetMigrationParams(priv->mon, &params) < 0)
+    if (qemuMigrationParamsApplyValues(vm, migParams, postcopyResume) < 0)
         goto cleanup;
 
     ret = 0;
-- 
2.35.1


From mkletzan at redhat.com  Fri Jul 22 15:43:41 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Fri, 22 Jul 2022 17:43:41 +0200
Subject: [PATCH 3/3] qemu_driver: use qemuMonitorQueryStats to extract
 halt poll time
In-Reply-To: <20220714055204.1277661-4-natto@weirdnatto.in>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-4-natto@weirdnatto.in>
Message-ID: <YtrFrVNizFip3ttn@wheatley>

On Thu, Jul 14, 2022 at 11:22:04AM +0530, Amneesh Singh wrote:
>Related: https://gitlab.com/libvirt/libvirt/-/issues/276
>
>This patch uses qemuMonitorQueryStats to query "halt_poll_success_ns"
>and "halt_poll_fail_ns" for every vCPU. The respective values for each
>vCPU are then added together.
>
>Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
>---
> src/qemu/qemu_driver.c | 69 +++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 61 insertions(+), 8 deletions(-)
>
>diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
>index da95f947..e1c595e5 100644
>--- a/src/qemu/qemu_driver.c
>+++ b/src/qemu/qemu_driver.c
>@@ -18066,15 +18066,68 @@ qemuDomainGetStatsCpuCgroup(virDomainObj *dom,
> }
>
> static int
>-qemuDomainGetStatsCpuHaltPollTime(virDomainObj *dom,
>-                                  virTypedParamList *params)
>+qemuDomainGetStatsCpuHaltPollTime(virQEMUDriver *driver,
>+                                  virDomainObj *dom,
>+                                  virTypedParamList *params,
>+                                  unsigned int privflags)
> {
>     unsigned long long haltPollSuccess = 0;
>     unsigned long long haltPollFail = 0;
>-    pid_t pid = dom->pid;
>+    qemuDomainObjPrivate *priv = dom->privateData;
>+    bool queryStatsCap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_STATS);
>
>-    if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
>-        return 0;
>+    if (queryStatsCap && HAVE_JOB(privflags) && virDomainObjIsActive(dom)) {
>+        size_t i;
>+        qemuMonitorQueryStatsTargetType target = QEMU_MONITOR_QUERY_STATS_TARGET_VCPU;
>+        qemuMonitorQueryStatsProvider *provider = NULL;
>+        g_autoptr(GPtrArray) providers = NULL;
>+        g_autoptr(GPtrArray) queried_stats = NULL;
>+        provider = qemuMonitorQueryStatsProviderNew(
>+            QEMU_MONITOR_QUERY_STATS_PROVIDER_KVM,
>+            QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS,
>+            QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS,
>+            QEMU_MONITOR_QUERY_STATS_NAME_LAST);
>+
>+        providers = g_ptr_array_new_full(1, (GDestroyNotify) qemuMonitorQueryStatsProviderFree);
>+        g_ptr_array_add(providers, provider);
>+
>+        qemuDomainObjEnterMonitor(driver, dom);
>+        queried_stats = qemuMonitorQueryStats(priv->mon, target, NULL, providers);
>+        qemuDomainObjExitMonitor(dom);
>+
>+        if (!queried_stats)
>+            return 0;
>+
>+        for (i = 0; i < queried_stats->len; i++) {
>+            unsigned long long curHaltPollSuccess, curHaltPollFail;
>+            GHashTable *cur_table = queried_stats->pdata[i];
>+            virJSONValue *success_obj, *fail_obj;
>+            const char *success_str = qemuMonitorQueryStatsNameTypeToString(
>+                QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_SUCCESS_NS);
>+            const char *fail_str = qemuMonitorQueryStatsNameTypeToString(
>+                QEMU_MONITOR_QUERY_STATS_NAME_HALT_POLL_FAIL_NS);
>+
>+            success_obj = g_hash_table_lookup(cur_table, success_str);
>+            fail_obj = g_hash_table_lookup(cur_table, fail_str);
>+
>+            if (!success_obj || !fail_obj)
>+                return 0;
>+
>+            if (virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess) < 0)
>+                return 0;
>+
>+            if (virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail) < 0)
>+                return 0;
>+

As mentioned before, all these failures do not have to exit the function, but
rather fallback to the old way.  You can even create two new functions for the
new and old implementations and then call them from here to make the fallback
easier to spot (and code).

I wanted to change this before pushing as well, but I feel like I'm changing too
much of your code.  And I also had to rebase this (although trivially).  Would
you mind just changing these few last things so that we can get it in before the
rc0 freeze?

Thanks and have a nice weekend,
Martin

>+            haltPollSuccess += curHaltPollSuccess;
>+            haltPollFail += curHaltPollFail;
>+        }
>+    } else {
>+        pid_t pid = dom->pid;
>+
>+        if (virHostCPUGetHaltPollTime(pid, &haltPollSuccess, &haltPollFail) < 0)
>+            return 0;
>+    }
>
>     if (virTypedParamListAddULLong(params, haltPollSuccess, "cpu.haltpoll.success.time") < 0 ||
>         virTypedParamListAddULLong(params, haltPollFail, "cpu.haltpoll.fail.time") < 0)
>@@ -18087,7 +18140,7 @@ static int
> qemuDomainGetStatsCpu(virQEMUDriver *driver,
>                       virDomainObj *dom,
>                       virTypedParamList *params,
>-                      unsigned int privflags G_GNUC_UNUSED)
>+                      unsigned int privflags)
> {
>     if (qemuDomainGetStatsCpuCgroup(dom, params) < 0)
>         return -1;
>@@ -18095,7 +18148,7 @@ qemuDomainGetStatsCpu(virQEMUDriver *driver,
>     if (qemuDomainGetStatsCpuCache(driver, dom, params) < 0)
>         return -1;
>
>-    if (qemuDomainGetStatsCpuHaltPollTime(dom, params) < 0)
>+    if (qemuDomainGetStatsCpuHaltPollTime(driver, dom, params, privflags) < 0)
>         return -1;
>
>     return 0;
>@@ -18929,7 +18982,7 @@ static virQEMUCapsFlags queryDirtyRateRequired[] = {
>
> static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = {
>     { qemuDomainGetStatsState, VIR_DOMAIN_STATS_STATE, false, NULL },
>-    { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, false, NULL },
>+    { qemuDomainGetStatsCpu, VIR_DOMAIN_STATS_CPU_TOTAL, true, NULL },
>     { qemuDomainGetStatsBalloon, VIR_DOMAIN_STATS_BALLOON, true, NULL },
>     { qemuDomainGetStatsVcpu, VIR_DOMAIN_STATS_VCPU, true, NULL },
>     { qemuDomainGetStatsInterface, VIR_DOMAIN_STATS_INTERFACE, false, NULL },
>-- 
>2.36.1
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220722/f792a847/attachment.sig>

From berrange at redhat.com  Fri Jul 22 16:23:15 2022
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Fri, 22 Jul 2022 17:23:15 +0100
Subject: [libvirt PATCH 0/2] qemu: support stateless UEFI firmware
Message-ID: <20220722162317.2377173-1-berrange@redhat.com>

This is to enable SEV builds of UEFI which provide only a single CODE.fd
file, with not VARS.fd.

Daniel P. Berrang? (2):
  conf: support stateless UEFI firmware
  qemu: support use of stateless EFI firmware

 docs/formatdomain.rst                         |  9 +++-
 src/conf/domain_conf.c                        |  9 ++++
 src/conf/domain_conf.h                        |  1 +
 src/conf/domain_validate.c                    | 26 ++++++++++
 src/conf/schemas/domaincommon.rng             |  5 ++
 src/qemu/qemu_domain.c                        |  3 +-
 src/qemu/qemu_firmware.c                      | 48 +++++++++++--------
 ...-auto-bios-not-stateless.x86_64-latest.err |  1 +
 .../firmware-auto-bios-not-stateless.xml      | 18 +++++++
 ...are-auto-bios-stateless.x86_64-latest.args | 32 +++++++++++++
 .../firmware-auto-bios-stateless.xml          | 18 +++++++
 ...ware-auto-efi-stateless.x86_64-latest.args | 33 +++++++++++++
 .../firmware-auto-efi-stateless.xml           | 18 +++++++
 .../firmware-manual-bios-not-stateless.err    |  1 +
 .../firmware-manual-bios-not-stateless.xml    | 15 ++++++
 .../firmware-manual-bios-stateless.args       | 30 ++++++++++++
 .../firmware-manual-bios-stateless.xml        | 15 ++++++
 ...nual-efi-nvram-stateless.x86_64-latest.err |  1 +
 .../firmware-manual-efi-nvram-stateless.xml   | 21 ++++++++
 ...nvram-template-stateless.x86_64-latest.err |  1 +
 ...re-manual-efi-nvram-template-stateless.xml | 19 ++++++++
 ...re-manual-efi-stateless.x86_64-latest.args | 33 +++++++++++++
 .../firmware-manual-efi-stateless.xml         | 18 +++++++
 tests/qemuxml2argvtest.c                      | 10 ++++
 ...ware-auto-bios-stateless.x86_64-latest.xml | 34 +++++++++++++
 .../firmware-manual-bios-stateless.xml        | 25 ++++++++++
 .../firmware-manual-bios.xml                  | 25 ++++++++++
 tests/qemuxml2xmltest.c                       |  3 ++
 28 files changed, 451 insertions(+), 21 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
 create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
 create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios.xml

-- 
2.36.1


From berrange at redhat.com  Fri Jul 22 16:23:17 2022
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Fri, 22 Jul 2022 17:23:17 +0100
Subject: [libvirt PATCH 2/2] qemu: support use of stateless EFI firmware
In-Reply-To: <20220722162317.2377173-1-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
Message-ID: <20220722162317.2377173-3-berrange@redhat.com>

When the <loader stateless='yes'/> attribute is set, the QEMU driver
needs to do three things

 - Avoid looking for an NVRAM template
 - Avoid auto-populating an <nvram/> path
 - Find firmware descriptors with mode=stateless instead of mode=split

Note, the first thing happens automatically when we solve the second
thing.

Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
---
 src/qemu/qemu_domain.c                        |  3 +-
 src/qemu/qemu_firmware.c                      | 48 +++++++++++--------
 ...ware-auto-efi-stateless.x86_64-latest.args | 33 +++++++++++++
 .../firmware-auto-efi-stateless.xml           | 18 +++++++
 ...re-manual-efi-stateless.x86_64-latest.args | 33 +++++++++++++
 .../firmware-manual-efi-stateless.xml         | 18 +++++++
 tests/qemuxml2argvtest.c                      |  2 +
 7 files changed, 135 insertions(+), 20 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7df8041adf..b02ffc9a2e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4683,7 +4683,8 @@ qemuDomainDefPostParse(virDomainDef *def,
     }
 
     if (virDomainDefHasOldStyleROUEFI(def) &&
-        !def->os.loader->nvram) {
+        !def->os.loader->nvram &&
+        def->os.loader->stateless != VIR_TRISTATE_BOOL_YES) {
         def->os.loader->nvram = virStorageSourceNew();
         def->os.loader->nvram->type = VIR_STORAGE_TYPE_FILE;
         def->os.loader->nvram->format = VIR_STORAGE_FILE_RAW;
diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index c477b45d62..eb7abb0b32 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1110,10 +1110,18 @@ qemuFirmwareMatchDomain(const virDomainDef *def,
         return false;
     }
 
-    if (fw->mapping.device == QEMU_FIRMWARE_DEVICE_FLASH &&
-        fw->mapping.data.flash.mode != QEMU_FIRMWARE_FLASH_MODE_SPLIT) {
-        VIR_DEBUG("Discarding loader without split flash");
-        return false;
+    if (fw->mapping.device == QEMU_FIRMWARE_DEVICE_FLASH) {
+        if (def->os.loader && def->os.loader->stateless == VIR_TRISTATE_BOOL_YES) {
+            if (fw->mapping.data.flash.mode != QEMU_FIRMWARE_FLASH_MODE_STATELESS) {
+                VIR_DEBUG("Discarding loader without stateless flash");
+                return false;
+            }
+        } else {
+            if (fw->mapping.data.flash.mode != QEMU_FIRMWARE_FLASH_MODE_SPLIT) {
+                VIR_DEBUG("Discarding loader without split flash");
+                return false;
+            }
+        }
     }
 
     if (def->sec) {
@@ -1175,27 +1183,29 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver,
         VIR_FREE(def->os.loader->path);
         def->os.loader->path = g_strdup(flash->executable.filename);
 
-        if (STRNEQ(flash->nvram_template.format, "raw")) {
-            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-                           _("unsupported nvram template format '%s'"),
-                           flash->nvram_template.format);
-            return -1;
-        }
+        if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_SPLIT) {
+            if (STRNEQ(flash->nvram_template.format, "raw")) {
+                virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                               _("unsupported nvram template format '%s'"),
+                               flash->nvram_template.format);
+                return -1;
+            }
 
-        VIR_FREE(def->os.loader->nvramTemplate);
-        def->os.loader->nvramTemplate = g_strdup(flash->nvram_template.filename);
+            VIR_FREE(def->os.loader->nvramTemplate);
+            def->os.loader->nvramTemplate = g_strdup(flash->nvram_template.filename);
 
-        if (!def->os.loader->nvram) {
-            def->os.loader->nvram = virStorageSourceNew();
-            def->os.loader->nvram->type = VIR_STORAGE_TYPE_FILE;
-            def->os.loader->nvram->format = VIR_STORAGE_FILE_RAW;
-            qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram->path);
+            if (!def->os.loader->nvram) {
+                def->os.loader->nvram = virStorageSourceNew();
+                def->os.loader->nvram->type = VIR_STORAGE_TYPE_FILE;
+                def->os.loader->nvram->format = VIR_STORAGE_FILE_RAW;
+                qemuDomainNVRAMPathFormat(cfg, def, &def->os.loader->nvram->path);
+            }
         }
 
         VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'",
                   def->os.loader->path,
-                  def->os.loader->nvramTemplate,
-                  def->os.loader->nvram->path);
+                  NULLSTR(def->os.loader->nvramTemplate),
+                  NULLSTR(def->os.loader->nvram ? def->os.loader->nvram->path : NULL));
         break;
 
     case QEMU_FIRMWARE_DEVICE_KERNEL:
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
new file mode 100644
index 0000000000..89f733761e
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-fedora \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=fedora,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF.sev.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-accel kvm \
+-cpu qemu64 \
+-m 8 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
new file mode 100644
index 0000000000..1be0f4fd96
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
@@ -0,0 +1,18 @@
+<domain type='kvm'>
+  <name>fedora</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+  <memory unit='KiB'>8192</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os firmware='efi'>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <loader stateless='yes'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
new file mode 100644
index 0000000000..fa4a677ce9
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
@@ -0,0 +1,33 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-test-bios \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=test-bios,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
+-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 1024 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":1073741824}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
new file mode 100644
index 0000000000..6f2a4963b1
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
@@ -0,0 +1,18 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <loader readonly='yes' type='pflash' stateless='yes'>/usr/share/OVMF/OVMF_CODE.fd</loader>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 57d5f3e1c1..b72d61c3bc 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1205,6 +1205,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_IOH3420,
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-stateless");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
@@ -1228,6 +1229,7 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-not-stateless");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram");
     DO_TEST_CAPS_LATEST("firmware-auto-efi");
+    DO_TEST_CAPS_LATEST("firmware-auto-efi-stateless");
     DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram");
     DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-insecure");
-- 
2.36.1


From berrange at redhat.com  Fri Jul 22 16:23:16 2022
From: berrange at redhat.com (=?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?=)
Date: Fri, 22 Jul 2022 17:23:16 +0100
Subject: [libvirt PATCH 1/2] conf: support stateless UEFI firmware
In-Reply-To: <20220722162317.2377173-1-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
Message-ID: <20220722162317.2377173-2-berrange@redhat.com>

Normally when an UEFI firmware is marked as read-only, an associated
NVRAM file will be created. Some builds of UEFI firmware, however, wish
to remain stateless and so will be read-only, but never have any NVRAM
file. To represent this concept a 'stateless' tristate bool attribute
is introduced on the <loader/> element.

There are rather a large number of permutations to consider.

With default firmware selection

  *  <os/>

     => Historic default, no change

  *  <os>
       <loader stateless='yes'/>
     </os>

     => Explicit version of historic default, no change

  *  <os>
       <loader stateless='no'/>
     </os>

      => Invalid, bios is always stateless

With manual legacy BIOS selection

  *  <os>
       <loader>/path/to/seabios</loader>
       ...
     </os>

     => Historic default, no change

  *  <os>
       <loader stateless='yes'>/path/to/seabios</loader>
       ...
     </os>

     => Explicit version of historic default, no change

  *  <os>
       <loader stateless='no'>/path/to/seabios</loader>
       ...
     </os>

      => Invalid, bios is always stateless

With manual UEFI selection

  *  <os>
       <loader type='pflash'>/path/to/edk2</loader>
       ...
     </os>

     => Historic default, no change

  *  <os>
       <loader type='pflash' stateless='yes'>/path/to/edk2</loader>
       ...
     </os>

     => Skip auto-filling NVRAM / template

  *  <os>
       <loader type='pflash' stateless='no'>/path/to/edk2</loader>
       ...
     </os>

     => Explicit version of historic default, no change

With automatic firmware selection

  *  <os firmware='bios'/>

     => Historic default, no change

  *  <os firmware='bios'>
       <loader stateless='yes'/>
     </os>

     => Explicit version of historic default, no change

  *  <os firmware='bios'>
       <loader stateless='no'/>
     </os>

      => Invalid, bios is always stateless

  *  <os firmware='uefi'/>

     => Historic default, no change

  *  <os firmware='uefi'>
       <loader stateless='yes'/>
     </os>

     => Skip auto-filling NVRAM / template

  *  <os firmware='uefi'>
       <loader stateless='no'/>
     </os>

     => Explicit version of historic default, no change

Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
---
 docs/formatdomain.rst                         |  9 ++++-
 src/conf/domain_conf.c                        |  9 +++++
 src/conf/domain_conf.h                        |  1 +
 src/conf/domain_validate.c                    | 26 ++++++++++++++
 src/conf/schemas/domaincommon.rng             |  5 +++
 ...-auto-bios-not-stateless.x86_64-latest.err |  1 +
 .../firmware-auto-bios-not-stateless.xml      | 18 ++++++++++
 ...are-auto-bios-stateless.x86_64-latest.args | 32 +++++++++++++++++
 .../firmware-auto-bios-stateless.xml          | 18 ++++++++++
 .../firmware-manual-bios-not-stateless.err    |  1 +
 .../firmware-manual-bios-not-stateless.xml    | 15 ++++++++
 .../firmware-manual-bios-stateless.args       | 30 ++++++++++++++++
 .../firmware-manual-bios-stateless.xml        | 15 ++++++++
 ...nual-efi-nvram-stateless.x86_64-latest.err |  1 +
 .../firmware-manual-efi-nvram-stateless.xml   | 21 ++++++++++++
 ...nvram-template-stateless.x86_64-latest.err |  1 +
 ...re-manual-efi-nvram-template-stateless.xml | 19 +++++++++++
 tests/qemuxml2argvtest.c                      |  8 +++++
 ...ware-auto-bios-stateless.x86_64-latest.xml | 34 +++++++++++++++++++
 .../firmware-manual-bios-stateless.xml        | 25 ++++++++++++++
 .../firmware-manual-bios.xml                  | 25 ++++++++++++++
 tests/qemuxml2xmltest.c                       |  3 ++
 22 files changed, 316 insertions(+), 1 deletion(-)
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
 create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
 create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
 create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios.xml

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 3ea094e64c..4199abfd1a 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -242,7 +242,11 @@ harddisk, cdrom, network) determining where to obtain/find the boot image.
    firmwares may implement the Secure boot feature. Attribute ``secure`` can be
    used to tell the hypervisor that the firmware is capable of Secure Boot feature.
    It cannot be used to enable or disable the feature itself in the firmware.
-   :since:`Since 2.1.0`
+   :since:`Since 2.1.0`. If the loader is marked as read-only, then with UEFI it
+   is assumed that there will be a writable NVRAM available. In some cases,
+   however, it may be desirable for the loader to run without any NVRAM, discarding
+   any config changes on shutdown. The ``stateless`` flag can be used to control
+   this behaviour, when set to ``no`` NVRAM will never be created.
 ``nvram``
    Some UEFI firmwares may want to use a non-volatile memory to store some
    variables. In the host, this is represented as a file and the absolute path
@@ -262,6 +266,9 @@ harddisk, cdrom, network) determining where to obtain/find the boot image.
    **Note:** ``network`` backed NVRAM the variables are not instantiated from
    the ``template`` and it's user's responsibility to provide a valid NVRAM image.
 
+   It is not valid to provide this element if the loader is marked as
+   stateless.
+
 ``boot``
    The ``dev`` attribute takes one of the values "fd", "hd", "cdrom" or
    "network" and is used to specify the next boot device to consider. The
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c7564e3a3a..e85cc1f809 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16682,6 +16682,10 @@ virDomainLoaderDefParseXML(virDomainLoaderDef *loader,
                                &loader->secure) < 0)
         return -1;
 
+    if (virXMLPropTristateBool(loaderNode, "stateless", VIR_XML_PROP_NONE,
+                               &loader->stateless) < 0)
+        return -1;
+
     return 0;
 }
 
@@ -25888,6 +25892,11 @@ virDomainLoaderDefFormat(virBuffer *buf,
         virBufferAsprintf(&loaderAttrBuf, " type='%s'",
                           virDomainLoaderTypeToString(loader->type));
 
+    if (loader->stateless != VIR_TRISTATE_BOOL_ABSENT) {
+        virBufferAsprintf(&loaderAttrBuf, " stateless='%s'",
+                          virTristateBoolTypeToString(loader->stateless));
+    }
+
     virBufferEscapeString(&loaderChildBuf, "%s", loader->path);
 
     virXMLFormatElementInternal(buf, "loader", &loaderAttrBuf, &loaderChildBuf, false, false);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 90de50c12f..060c395943 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2266,6 +2266,7 @@ struct _virDomainLoaderDef {
     virTristateBool readonly;
     virDomainLoader type;
     virTristateBool secure;
+    virTristateBool stateless;
     virStorageSource *nvram;
     bool newStyleNVRAM;
     char *nvramTemplate;   /* user override of path to master nvram */
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 814922cd46..cfd868fafa 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1672,6 +1672,32 @@ virDomainDefOSValidate(const virDomainDef *def,
         }
     }
 
+    if (loader->stateless == VIR_TRISTATE_BOOL_YES) {
+        if (loader->nvramTemplate) {
+            virReportError(VIR_ERR_XML_DETAIL, "%s",
+                           _("NVRAM template is not permitted when loader is stateless"));
+            return -1;
+        }
+
+        if (loader->nvram) {
+            virReportError(VIR_ERR_XML_DETAIL, "%s",
+                           _("NVRAM is not permitted when loader is stateless"));
+            return -1;
+        }
+    } else if (loader->stateless == VIR_TRISTATE_BOOL_NO) {
+        if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) {
+            if (def->os.loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH) {
+                virReportError(VIR_ERR_XML_DETAIL, "%s",
+                               _("Only pflash loader type permits NVRAM"));
+                return -1;
+            }
+        } else if (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
+            virReportError(VIR_ERR_XML_DETAIL, "%s",
+                           _("Only EFI firmware permits NVRAM"));
+            return -1;
+        }
+    }
+
     return 0;
 }
 
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 2f07c25430..aaecf795c6 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -320,6 +320,11 @@
                 </choice>
               </attribute>
             </optional>
+            <optional>
+              <attribute name="stateless">
+                <ref name="virYesNo"/>
+              </attribute>
+            </optional>
             <optional>
               <ref name="absFilePath"/>
             </optional>
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
new file mode 100644
index 0000000000..b058f970a4
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
@@ -0,0 +1 @@
+Only EFI firmware permits NVRAM
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
new file mode 100644
index 0000000000..b2c8fc1122
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
@@ -0,0 +1,18 @@
+<domain type='kvm'>
+  <name>fedora</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+  <memory unit='KiB'>8192</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os firmware='bios'>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <loader stateless='no'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
new file mode 100644
index 0000000000..1d45a8cfba
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-fedora \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=fedora,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu qemu64 \
+-bios /usr/share/seabios/bios-256k.bin \
+-m 8 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":8388608}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-boot strict=on \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
new file mode 100644
index 0000000000..4847951346
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
@@ -0,0 +1,18 @@
+<domain type='kvm'>
+  <name>fedora</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+  <memory unit='KiB'>8192</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os firmware='bios'>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <loader stateless='yes'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
new file mode 100644
index 0000000000..188a5a4180
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
@@ -0,0 +1 @@
+Only pflash loader type permits NVRAM
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
new file mode 100644
index 0000000000..b60878ca0b
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
@@ -0,0 +1,15 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <loader stateless='no'>/usr/share/seabios/bios.bin</loader>
+  </os>
+  <devices>
+   <emulator>/usr/bin/qemu-system-i386</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
new file mode 100644
index 0000000000..e1cb064b71
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
@@ -0,0 +1,30 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-test-bios \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-i386 \
+-name guest=test-bios,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
+-machine pc,usb=off,dump-guest-core=off \
+-accel tcg \
+-bios /usr/share/seabios/bios.bin \
+-m 1024 \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
new file mode 100644
index 0000000000..9d6f4e4c83
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
@@ -0,0 +1,15 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <loader stateless='yes'>/usr/share/seabios/bios.bin</loader>
+  </os>
+  <devices>
+   <emulator>/usr/bin/qemu-system-i386</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
new file mode 100644
index 0000000000..de8db3763d
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
@@ -0,0 +1 @@
+NVRAM is not permitted when loader is stateless
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
new file mode 100644
index 0000000000..717712e89b
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
@@ -0,0 +1,21 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <loader stateless='yes' readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
+    <nvram type='file'>
+      <source file='/var/lib/libvirt/nvram/guest_VARS.fd'/>
+    </nvram>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
new file mode 100644
index 0000000000..95ec794c17
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
@@ -0,0 +1 @@
+NVRAM template is not permitted when loader is stateless
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
new file mode 100644
index 0000000000..a6d7079b78
--- /dev/null
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
@@ -0,0 +1,19 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <loader stateless='yes' readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
+    <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' model='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b2da42cb1f..57d5f3e1c1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1190,6 +1190,10 @@ mymain(void)
 
     DO_TEST("firmware-manual-bios",
             QEMU_CAPS_DEVICE_ISA_SERIAL);
+    DO_TEST("firmware-manual-bios-stateless",
+            QEMU_CAPS_DEVICE_ISA_SERIAL);
+    DO_TEST_PARSE_ERROR("firmware-manual-bios-not-stateless",
+                        QEMU_CAPS_DEVICE_ISA_SERIAL);
     DO_TEST_NOCAPS("firmware-manual-efi");
     DO_TEST_PARSE_ERROR_NOCAPS("firmware-manual-efi-no-path");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features");
@@ -1202,10 +1206,12 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-stateless");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
     DO_TEST_CAPS_VER_PARSE_ERROR("firmware-manual-efi-nvram-network-iscsi", "4.1.0");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-stateless");
 
     /* Make sure all combinations of ACPI and UEFI behave as expected */
     DO_TEST_NOCAPS("firmware-manual-efi-acpi-aarch64");
@@ -1218,6 +1224,8 @@ mymain(void)
     DO_TEST_NOCAPS("firmware-manual-noefi-noacpi-q35");
 
     DO_TEST_CAPS_LATEST("firmware-auto-bios");
+    DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless");
+    DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-not-stateless");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-bios-nvram");
     DO_TEST_CAPS_LATEST("firmware-auto-efi");
     DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram");
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
new file mode 100644
index 0000000000..f1b5516ce4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
@@ -0,0 +1,34 @@
+<domain type='kvm'>
+  <name>fedora</name>
+  <uuid>63840878-0deb-4095-97e6-fc444d9bc9fa</uuid>
+  <memory unit='KiB'>8192</memory>
+  <currentMemory unit='KiB'>8192</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os firmware='bios'>
+    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
+    <loader stateless='yes'/>
+    <boot dev='hd'/>
+  </os>
+  <features>
+    <acpi/>
+  </features>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='usb' index='0' model='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'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
new file mode 100644
index 0000000000..de5ecb96dc
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
@@ -0,0 +1,25 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <loader type='rom' stateless='yes'>/usr/share/seabios/bios.bin</loader>
+    <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>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-manual-bios.xml b/tests/qemuxml2xmloutdata/firmware-manual-bios.xml
new file mode 100644
index 0000000000..75bb6038ca
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/firmware-manual-bios.xml
@@ -0,0 +1,25 @@
+<domain type='qemu'>
+  <name>test-bios</name>
+  <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid>
+  <memory unit='KiB'>1048576</memory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <loader type='rom'>/usr/share/seabios/bios.bin</loader>
+    <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>
+    <controller type='usb' index='0' model='none'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 68e5041bfd..8cac50c767 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1067,12 +1067,15 @@ mymain(void)
     DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT, QEMU_CAPS_OBJECT_MEMORY_RAM);
     DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode");
 
+    DO_TEST_NOCAPS("firmware-manual-bios");
+    DO_TEST_NOCAPS("firmware-manual-bios-stateless");
     DO_TEST_NOCAPS("firmware-manual-efi");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
     DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");
 
     DO_TEST_CAPS_LATEST("firmware-auto-bios");
+    DO_TEST_CAPS_LATEST("firmware-auto-bios-stateless");
     DO_TEST_CAPS_LATEST("firmware-auto-efi");
     DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram");
     DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
-- 
2.36.1


From pbonzini at redhat.com  Fri Jul 22 17:09:57 2022
From: pbonzini at redhat.com (Paolo Bonzini)
Date: Fri, 22 Jul 2022 19:09:57 +0200
Subject: [PATCH 3/3] qemu_driver: use qemuMonitorQueryStats to extract
 halt poll time
In-Reply-To: <YtrFrVNizFip3ttn@wheatley>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-4-natto@weirdnatto.in> <YtrFrVNizFip3ttn@wheatley>
Message-ID: <cd716676-0aea-4e6a-dbbd-c6e38cfb93ab@redhat.com>

On 7/22/22 17:43, Martin Kletzander wrote:
> As mentioned before, all these failures do not have to exit the 
> function, but rather fallback to the old way.  You can even create
> two new functions for the new and old implementations and then call
> them from here to make the fallback easier to spot (and code).

More precisely, they should just "continue;" to the next iteration of
the for loop, like


             if (!success_obj || !fail_obj)
                 continue;

             found = true;

and then go fall back if found is false at the end of the loop.

On the other hand, here:

             if (virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess) < 0)
                 return 0;

             if (virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail) < 0)
                 return 0;

I am not sure about falling back, because it is really an unexpected
situation where the statistic exist but somehow the value cannot be
parsed.

Paolo

> I wanted to change this before pushing as well, but I feel like I'm 
> changing too much of your code.  And I also had to rebase this
> (although trivially). Would you mind just changing these few last
> things so that we can get it in before the rc0 freeze?


From lin.a.yang at intel.com  Fri Jul 22 18:29:54 2022
From: lin.a.yang at intel.com (Yang, Lin A)
Date: Fri, 22 Jul 2022 18:29:54 +0000
Subject: [libvirt][PATCH v13 0/6] Support query and use SGX
In-Reply-To: <9d4078cd-7db9-ab56-f523-3b2e884e9613@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <f262d122-0eac-2821-b239-daa68665dcb9@redhat.com>
 <MN0PR11MB59872F1E8C69450683226C9BD48E9@MN0PR11MB5987.namprd11.prod.outlook.com>
 <YtkJITO+5QjumAQW@redhat.com>
 <f0331e80-076a-4e33-0f29-48fa2b4f96f8@redhat.com>
 <YtlTiOq09a2h+kg7@redhat.com>
 <deba5414-f55c-7e18-fcd6-3ff6cd1c3e67@redhat.com>
 <MN0PR11MB5987116AC4AA1554C411B542D4909@MN0PR11MB5987.namprd11.prod.outlook.com>
 <9d4078cd-7db9-ab56-f523-3b2e884e9613@redhat.com>
Message-ID: <MN0PR11MB59877B822434D7C4F43E394CD4909@MN0PR11MB5987.namprd11.prod.outlook.com>

> Well, as discussed with Daniel earlier, libvirt creates a separate mount
> namespace for each QEMU and inside it creates a very thin /dev with only a
> handful of nodes (per guest config). And what my patch does (and what we
> already do for /dev/sev) is mknod() /dev/sgx_provision and /dev/sgx_vepc inside
> that thin /dev and chown() it to the user under which QEMU is about to run.
> 
> This namespace feature can be turned off though, in which case libvirt won't
> chown() those files (well, my patch is written that way). I think this is acceptable
> trade off between security and usability. Namespaces are enabled by default (if
> kernel supports them).
> 
> Alright, so here's what we'll do. I'll polish my patches, fix up yours and send for
> review. Does this work for you?

Definitely Yes! This is awesome!
Really appreciated your help.

Good to know libvirt creates separate mount namespace and thin /dev for each
QEMU.

Lin.


From natto at weirdnatto.in  Sun Jul 24 05:03:55 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Sun, 24 Jul 2022 10:33:55 +0530
Subject: [PATCH 1/3] qemu_monitor: add qemuMonitorQueryStats
In-Reply-To: <Ytq77sNRu1qk3SR8@wheatley>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-2-natto@weirdnatto.in>
 <CAJEdO+3rm1VcGfh7gYNntSAzf4vDm-RceaUdoXe-RZC2+DuEWg@mail.gmail.com>
 <Ytq77sNRu1qk3SR8@wheatley>
Message-ID: <20220724050355.fmmzt5chxquhjpo4@Satori>

On Fri, Jul 22, 2022 at 05:02:06PM +0200, Martin Kletzander wrote:
> On Fri, Jul 22, 2022 at 02:44:30PM +0200, Kristina Hanicova wrote:
> > On Thu, Jul 14, 2022 at 7:54 AM Amneesh Singh <natto at weirdnatto.in> wrote:
> > 
> > > Related: https://gitlab.com/libvirt/libvirt/-/issues/276
> > > 
> > > This patch adds an API for the "query-stats" QMP command.
> > > 
> > > The query returns a JSON containing the statistics based on the target,
> > > which can either be vCPU or VM, and the providers. The API deserializes
> > > the query result into an array of GHashMaps, which can later be used to
> > > extract all the query statistics. GHashMaps are used to avoid traversing
> > > the entire array to find the statistics you are looking for. This would
> > > be a singleton array if the target is a VM since the returned JSON is
> > > also a singleton array in that case.
> > > 
> > > Signed-off-by: Amneesh Singh <natto at weirdnatto.in>
> > > ---
> > >  src/qemu/qemu_monitor.c      |  70 +++++++++++++++++++
> > >  src/qemu/qemu_monitor.h      |  45 ++++++++++++
> > >  src/qemu/qemu_monitor_json.c | 130 +++++++++++++++++++++++++++++++++++
> > >  src/qemu/qemu_monitor_json.h |   6 ++
> > >  4 files changed, 251 insertions(+)
> > > 
> > > diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> > > index fda5d2f3..a07e6017 100644
> > > --- a/src/qemu/qemu_monitor.c
> > > +++ b/src/qemu/qemu_monitor.c
> > > @@ -4541,3 +4541,73 @@ qemuMonitorMigrateRecover(qemuMonitor *mon,
> > > 
> > >      return qemuMonitorJSONMigrateRecover(mon, uri);
> > >  }
> > > +
> > > +VIR_ENUM_IMPL(qemuMonitorQueryStatsTarget,
> > > +              QEMU_MONITOR_QUERY_STATS_TARGET_LAST,
> > > +              "vm",
> > > +              "vcpu",
> > > +);
> > > +
> > > +VIR_ENUM_IMPL(qemuMonitorQueryStatsName,
> > > +              QEMU_MONITOR_QUERY_STATS_NAME_LAST,
> > > +              "halt_poll_success_ns",
> > > +              "halt_poll_fail_ns"
> > > +);
> > > +
> > > +VIR_ENUM_IMPL(qemuMonitorQueryStatsProvider,
> > > +              QEMU_MONITOR_QUERY_STATS_PROVIDER_LAST,
> > > +              "kvm",
> > > +);
> > > +
> > > +void
> > > +qemuMonitorQueryStatsProviderFree(qemuMonitorQueryStatsProvider *provider)
> > > +{
> > > +    virBitmapFree(provider->names);
> > > +    g_free(provider);
> > > +}
> > > +
> > > +qemuMonitorQueryStatsProvider *
> > > +qemuMonitorQueryStatsProviderNew(qemuMonitorQueryStatsProviderType
> > > provider_type,
> > > +                                 ...)
> > > +{
> > > +    g_autoptr(qemuMonitorQueryStatsProvider) provider = NULL;
> > > +    qemuMonitorQueryStatsNameType stat;
> > > +    va_list name_list;
> > > +    size_t sentinel = QEMU_MONITOR_QUERY_STATS_NAME_LAST;
> > > +
> > > +    provider = g_new0(qemuMonitorQueryStatsProvider, 1);
> > > +    provider->provider = provider_type;
> > > +    provider->names = NULL;
> > > +
> > > +    va_start(name_list, provider_type);
> > > +    stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
> > > +
> > > +    if (stat != sentinel) {
> > > 
> > 
> > It would be better to compare 'stat' with QEMU_MONITOR_QUERY_STATS_NAME_LAST
> > directly without the additional variable 'sentinel'.
> > 
> > 
> > > +        provider->names =
> > > virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
> > > +
> > > +        while (stat != sentinel) {
> > > 
> > 
> > Same here.
> > 
> > 
> > This while cycle would be better outside the if case, such as:
> > 
> > if (stat != sentinel)
> >    provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
> > 
> > while (stat != sentinel) {
> >    ....
> > }
> > 
> > Because the 'while' cycle has the same condition as the 'if' case.
> > 
> > 
> > > +            if (virBitmapSetBit(provider->names, stat) < 0)
> > > +                return NULL;
> > > +            stat = va_arg(name_list, qemuMonitorQueryStatsNameType);
> > > +        }
> > > +    }
> > > +    va_end(name_list);
> > > +
> > > +    return g_steal_pointer(&provider);
> > > +}
> 
> Sorry for so many review e-mails from me on this one patch, but while fixing few
> of the nitpicks I managed to rewrite the function quite a bit:
> 
>     qemuMonitorQueryStatsProvider *provider = g_new0(qemuMonitorQueryStatsProvider, 1);
>     qemuMonitorQueryStatsNameType stat;
>     va_list name_list;
> 
>     /*
>      * This can be lowered later in case of the enum getting quite large, hence
>      *  the virBitmapSetExpand below.
>      */
>     provider->names = virBitmapNew(QEMU_MONITOR_QUERY_STATS_NAME_LAST);
>     provider->type = provider_type;
> 
>     va_start(name_list, provider_type);
> 
>     while ((stat = va_arg(name_list, qemuMonitorQueryStatsNameType)) !=
>            QEMU_MONITOR_QUERY_STATS_NAME_LAST)
>         virBitmapSetBitExpand(provider->names, stat);
> 
>     va_end(name_list);
> 
>     return provider;
> 
> Let me know (both of you) if you are okay with me using this version.
Yes, that is absolutely fine, thanks for taking the time to review it. I
will keep the suggestions in mind the next time I submit the patches.
> 
> Thanks


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220724/9cf4f7df/attachment.sig>

From natto at weirdnatto.in  Sun Jul 24 05:20:36 2022
From: natto at weirdnatto.in (Amneesh Singh)
Date: Sun, 24 Jul 2022 10:50:36 +0530
Subject: [PATCH 3/3] qemu_driver: use qemuMonitorQueryStats to extract
 halt poll time
In-Reply-To: <cd716676-0aea-4e6a-dbbd-c6e38cfb93ab@redhat.com>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-4-natto@weirdnatto.in>
 <YtrFrVNizFip3ttn@wheatley>
 <cd716676-0aea-4e6a-dbbd-c6e38cfb93ab@redhat.com>
Message-ID: <20220724052036.3ilm34szd5hdvu3g@Satori>

On Fri, Jul 22, 2022 at 07:09:57PM +0200, Paolo Bonzini wrote:
> On 7/22/22 17:43, Martin Kletzander wrote:
> > As mentioned before, all these failures do not have to exit the
> > function, but rather fallback to the old way.  You can even create
> > two new functions for the new and old implementations and then call
> > them from here to make the fallback easier to spot (and code).
> 
> More precisely, they should just "continue;" to the next iteration of
> the for loop, like
> 
> 
>             if (!success_obj || !fail_obj)
>                 continue;
> 
>             found = true;
> 
> and then go fall back if found is false at the end of the loop.
> 
> On the other hand, here:
> 
>             if (virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess) < 0)
>                 return 0;
> 
>             if (virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail) < 0)
>                 return 0;
> 
> I am not sure about falling back, because it is really an unexpected
> situation where the statistic exist but somehow the value cannot be
> parsed.
Then can we just "continue;" in case the value fails to parse as well?
> 
> Paolo
> 
> > I wanted to change this before pushing as well, but I feel like I'm
> > changing too much of your code.  And I also had to rebase this
> > (although trivially). Would you mind just changing these few last
> > things so that we can get it in before the rc0 freeze?
Alright, as soon as there is a viable check decided for the virJSONValueGet*
statements above, I will push a v4 with the changes you mentioned in
your reviews. Thank you both for taking the time to review.
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220724/c98c5370/attachment.sig>

From simon.n.fairweather at gmail.com  Sun Jul 24 08:26:49 2022
From: simon.n.fairweather at gmail.com (Simon Fairweather)
Date: Sun, 24 Jul 2022 09:26:49 +0100
Subject: Qemu guest-reset option on device_add
In-Reply-To: <6a7b7334-e479-d081-59dc-6d7a27288d9d@redhat.com>
References: <CA+9vR5EV4=mv4H+1Ja2TZXnijJeaHV3-2AGeAso-yp23qpzbRw@mail.gmail.com>
 <37e4f82c-057f-32ae-105d-f10898f79471@redhat.com>
 <CA+9vR5E1dmUMxPEOkVOWjW1ADhsCakTrgmy_3=SJyK=5kokHwA@mail.gmail.com>
 <6a7b7334-e479-d081-59dc-6d7a27288d9d@redhat.com>
Message-ID: <CA+9vR5Hc8qai_f_koaV62QoS59-mtkQdZ+-QG2Pcg61dXHQb=A@mail.gmail.com>

Awesome, thanks!

On Tue, Jul 12, 2022 at 2:17 PM Michal Pr?vozn?k <mprivozn at redhat.com>
wrote:

> On 7/6/22 17:55, Simon Fairweather wrote:
> > Hi Michal, If you are able to implement the feature that would be great.
> >
> > Regards
> > Simon.
>
> Hey, I've posted patches here:
>
> https://listman.redhat.com/archives/libvir-list/2022-July/232756.html
>
> I'm not sure whether you want to build libvirt from git only to test
> them, or wait until release, but in general, the <source/> element
> gained new 'guestReset' attribute and you could use it like this:
>
> <hostdev mode='subsystem' type='usb' managed='yes'>
>   <source guestReset='no'>
>     <vendor>0x05ac</vendor>
>     <product>0x12a8</product>
>   </source>
> </hostdev>
>
> Michal
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220724/91d1e462/attachment.htm>

From haibin.huang at intel.com  Mon Jul 25 01:09:44 2022
From: haibin.huang at intel.com (Huang, Haibin)
Date: Mon, 25 Jul 2022 01:09:44 +0000
Subject: [libvirt][PATCH v13 2/6] Get SGX capabilities form QMP
In-Reply-To: <a3e35a71-516c-bf59-b42d-bb4a3c589a3d@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-3-lin.a.yang@intel.com>
 <a3e35a71-516c-bf59-b42d-bb4a3c589a3d@redhat.com>
Message-ID: <MW4PR11MB5909077BC9165BFA3335E8D591959@MW4PR11MB5909.namprd11.prod.outlook.com>

Nice comments, I accepted all comments.

> -----Original Message-----
> From: Michal Pr?vozn?k <mprivozn at redhat.com>
> Sent: Wednesday, July 20, 2022 7:27 PM
> To: Yang, Lin A <lin.a.yang at intel.com>; libvir-list at redhat.com; Huang, Haibin
> <haibin.huang at intel.com>; Ding, Jian-feng <jian-feng.ding at intel.com>
> Subject: Re: [libvirt][PATCH v13 2/6] Get SGX capabilities form QMP
> 
> On 7/1/22 21:14, Lin Yang wrote:
> > From: Haibin Huang <haibin.huang at intel.com>
> >
> > Generate the QMP command for query-sgx-capabilities and the command
> > return sgx capabilities from QMP.
> >
> > {"execute":"query-sgx-capabilities"}
> >
> > the right reply:
> >   {"return":
> >     {
> >       "sgx": true,
> >       "section-size": 197132288,
> >       "flc": true
> >     }
> >   }
> >
> > the error reply:
> >   {"error":
> >     {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
> >   }
> >
> > Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> > Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> > ---
> >  src/qemu/qemu_monitor.c      |  10 ++++
> >  src/qemu/qemu_monitor.h      |   3 +
> >  src/qemu/qemu_monitor_json.c | 113
> +++++++++++++++++++++++++++++++++++
> >  src/qemu/qemu_monitor_json.h |   4 ++
> >  4 files changed, 130 insertions(+)
> >
> > diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index
> > fda5d2f368..a1b2138921 100644
> > --- a/src/qemu/qemu_monitor.c
> > +++ b/src/qemu/qemu_monitor.c
> > @@ -3653,6 +3653,16 @@ qemuMonitorGetSEVCapabilities(qemuMonitor
> *mon,
> > }
> >
> >
> > +int
> > +qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
> > +                              virSGXCapability **capabilities) {
> > +    QEMU_CHECK_MONITOR(mon);
> > +
> > +    return qemuMonitorJSONGetSGXCapabilities(mon, capabilities); }
> > +
> > +
> >  int
> >  qemuMonitorNBDServerStart(qemuMonitor *mon,
> >                            const virStorageNetHostDef *server, diff
> > --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index
> > 95267ec6c7..451ac8eec9 100644
> > --- a/src/qemu/qemu_monitor.h
> > +++ b/src/qemu/qemu_monitor.h
> > @@ -864,6 +864,9 @@ int qemuMonitorGetGICCapabilities(qemuMonitor
> > *mon,  int qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
> >                                    virSEVCapability **capabilities);
> >
> > +int qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
> > +                                  virSGXCapability **capabilities);
> > +
> >  typedef enum {
> >    QEMU_MONITOR_MIGRATE_BACKGROUND       = 1 << 0,
> >    QEMU_MONITOR_MIGRATE_NON_SHARED_DISK  = 1 << 1, /* migration
> with
> > non-shared storage with full disk copy */ diff --git
> > a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index
> > 3aad2ab212..c900956f82 100644
> > --- a/src/qemu/qemu_monitor_json.c
> > +++ b/src/qemu/qemu_monitor_json.c
> > @@ -6445,6 +6445,119 @@
> qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
> >      return 1;
> >  }
> >
> > +
> > +/**
> > + * qemuMonitorJSONGetSGXCapabilities:
> > + * @mon: qemu monitor object
> > + * @capabilities: pointer to pointer to a SGX capability structure to
> > +be filled
> > + *
> > + * This function queries and fills in INTEL's SGX platform-specific data.
> > + * Note that from QEMU's POV both -object sgx-epc and
> > +query-sgx-capabilities
> > + * can be present even if SGX is not available, which basically
> > +leaves us with
> > + * checking for JSON "GenericError" in order to differentiate between
> > +compiled-in
> > + * support and actual SGX support on the platform.
> > + *
> > + * Returns: -1 on error,
> > + *           0 if SGX is not supported, and
> > + *           1 if SGX is supported on the platform.
> > + */
> > +int
> > +qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
> > +                                  virSGXCapability **capabilities) {
> > +    g_autoptr(virJSONValue) cmd = NULL;
> > +    g_autoptr(virJSONValue) reply = NULL;
> > +    g_autoptr(virSGXCapability) capability = NULL;
> > +
> > +    virJSONValue *sections = NULL;
> > +    virJSONValue *caps;
> > +    bool flc = false;
> > +    bool sgx1 = false;
> > +    bool sgx2 = false;
> > +    unsigned long long section_size = 0;
> > +    unsigned long long size;
> > +    size_t i;
> > +
> > +    *capabilities = NULL;
> > +    capability = g_new0(virSGXCapability, 1);
> > +
> > +    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities",
> NULL)))
> > +        return -1;
> > +
> > +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> > +        return -1;
> > +
> > +    /* QEMU has only compiled-in support of SGX */
> > +    if (qemuMonitorJSONHasError(reply, "GenericError"))
> > +        return 0;
> > +
> > +    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
> > +        return -1;
> > +
> > +    caps = virJSONValueObjectGetObject(reply, "return");
> > +
> > +    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
> > +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                       _("query-sgx-capabilities reply was missing 'flc' field"));
> > +        return -1;
> > +    }
> > +    capability->flc = flc;
> > +
> > +    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
> > +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
> > +        return -1;
> > +    }
> > +    capability->sgx1 = sgx1;
> > +
> > +    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
> > +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
> > +        return -1;
> > +    }
> > +    capability->sgx2 = sgx2;
> > +
> > +    if (virJSONValueObjectGetNumberUlong(caps, "section-size",
> &section_size) < 0) {
> > +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                       _("query-sgx-capabilities reply was missing 'section-size'
> field"));
> > +        return -1;
> > +    }
> > +    capability->section_size = section_size/1024;
> 
> Spaces around the operand please.
Ok, I will modify it.
> 
> > +
> > +    if (!(sections = virJSONValueObjectGetArray(caps, "sections"))) {
> > +        capability->nSections = 0;
> > +        capability->pSections = NULL;
> 
> This is needless. g_new0() used above made sure that the memory is zeroed
> out upon allocation, so these two lines are NOP.
> 
> > +        VIR_INFO("Sections was not obtained, so QEMU version is
> > + 6.2.0");
> 
> VIR_INFO() is probably too harsh. It's not anything that users should be
> concerned about. VIR_DEBUG() is much better. But then again, when debug
> logs are enabled then the QMP command and its reply are seen in the log
> and thus anybody reading it sees immediately whether a part is missing or
> not.
[Haibin] OK
> 
> > +        *capabilities = g_steal_pointer(&capability);
> > +        return 1;
> > +    }
> > +
> > +    // Got the section, the QEMU version is above 7.0.0
> > +    capability->nSections = virJSONValueArraySize(sections);
> > +    capability->pSections = g_new0(virSection, capability->nSections
> > + + 1);
> 
> This + 1 looks wrong to me. We already have nSections, and pSections is not
> an array of pointers either. So NULL terminated array is a bit overkill.

 [Haibin] OK
> > +
> > +    for (i = 0; i < capability->nSections; i++) {
> > +        virJSONValue *elem = virJSONValueArrayGet(sections, i);
> > +
> > +        if (virJSONValueObjectGetNumberUlong(elem, "size", &size) < 0) {
> > +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                           _("query-sgx-capabilities reply was missing 'size' field"));
> > +            return -1;
> > +        }
> > +        capability->pSections[i].size = size/1024;
> > +
> > +        if (virJSONValueObjectGetNumberUint(elem, "node", &(capability-
> >pSections[i].node)) < 0) {
> > +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                           _("query-sgx-capabilities reply was missing 'node' field"));
> > +            return -1;
> > +        }
> > +    }
> > +
> > +    *capabilities = g_steal_pointer(&capability);
> > +    return 1;
> > +}
> 
> Michal


From haibin.huang at intel.com  Mon Jul 25 01:31:30 2022
From: haibin.huang at intel.com (Huang, Haibin)
Date: Mon, 25 Jul 2022 01:31:30 +0000
Subject: [libvirt][PATCH v13 3/6] Convert QMP capabilities to domain
 capabilities
In-Reply-To: <0040ffc0-ab7a-3044-2dfa-866cf1d50623@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-4-lin.a.yang@intel.com>
 <0040ffc0-ab7a-3044-2dfa-866cf1d50623@redhat.com>
Message-ID: <MW4PR11MB5909B50226B9A783D694AC0591959@MW4PR11MB5909.namprd11.prod.outlook.com>

Hi Michal Peter,

Thank you for your comments.

Way 1:
virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");

Way 2:
    if (sgx->flc) {
        virBufferAsprintf(buf, "<flc>yes</flc>\n");
    } else {
        virBufferAsprintf(buf, "<flc>yes</flc>\n");
    }

For this section, both ways of writing work.

Peter Krempa said: "Don't use the ternary operator ('?'), use a full if/else branch instead or pick a better data structure."
You mean to be more concise use the ternary operator ('?').

I feel like it all makes sense.


> -----Original Message-----
> From: Michal Pr?vozn?k <mprivozn at redhat.com>
> Sent: Wednesday, July 20, 2022 7:27 PM
> To: Yang, Lin A <lin.a.yang at intel.com>; libvir-list at redhat.com; Huang, Haibin
> <haibin.huang at intel.com>; Ding, Jian-feng <jian-feng.ding at intel.com>
> Subject: Re: [libvirt][PATCH v13 3/6] Convert QMP capabilities to domain
> capabilities
> 
> On 7/1/22 21:14, Lin Yang wrote:
> > From: Haibin Huang <haibin.huang at intel.com>
> >
> > the QMP capabilities:
> >   {"return":
> >     {
> >       "sgx": true,
> >       "section-size": 1024,
> >       "flc": true
> >     }
> >   }
> >
> > the domain capabilities:
> >   <sgx>
> >     <flc>yes</flc>
> >     <epc_size>1</epc_size>
> >   </sgx>
> >
> > Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> > Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> > ---
> >  src/qemu/qemu_capabilities.c                  | 230 ++++++++++++++++++
> >  src/qemu/qemu_capabilities.h                  |   4 +
> >  .../caps_6.2.0.x86_64.replies                 |  30 ++-
> >  .../caps_6.2.0.x86_64.xml                     |   7 +
> >  .../caps_7.0.0.x86_64.replies                 |  34 ++-
> >  .../caps_7.0.0.x86_64.xml                     |  11 +
> >  .../caps_7.1.0.x86_64.replies                 |  34 ++-
> >  .../caps_7.1.0.x86_64.xml                     |  11 +
> >  8 files changed, 346 insertions(+), 15 deletions(-)
> >
> > diff --git a/src/qemu/qemu_capabilities.c
> > b/src/qemu/qemu_capabilities.c index 2c3be3ecec..57b5acb150 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -671,6 +671,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
> >                "chardev.qemu-vdagent", /*
> QEMU_CAPS_CHARDEV_QEMU_VDAGENT */
> >                "display-dbus", /* QEMU_CAPS_DISPLAY_DBUS */
> >                "iothread.thread-pool-max", /*
> > QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
> > +              "sgx-epc", /* QEMU_CAPS_SGX_EPC */
> >      );
> >
> >
> > @@ -752,6 +753,8 @@ struct _virQEMUCaps {
> >
> >      virSEVCapability *sevCapabilities;
> >
> > +    virSGXCapability *sgxCapabilities;
> > +
> >      /* Capabilities which may differ depending on the accelerator. */
> >      virQEMUCapsAccel kvm;
> >      virQEMUCapsAccel hvf;
> > @@ -1394,6 +1397,7 @@ struct virQEMUCapsStringFlags
> virQEMUCapsObjectTypes[] = {
> >      { "s390-pv-guest", QEMU_CAPS_S390_PV_GUEST },
> >      { "virtio-mem-pci", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI },
> >      { "virtio-iommu-pci", QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI },
> > +    { "sgx-epc", QEMU_CAPS_SGX_EPC },
> >  };
> >
> >
> > @@ -1972,6 +1976,32 @@ virQEMUCapsSEVInfoCopy(virSEVCapability
> **dst,
> > }
> >
> >
> > +static int
> > +virQEMUCapsSGXInfoCopy(virSGXCapability **dst,
> > +                       virSGXCapability *src) {
> > +    g_autoptr(virSGXCapability) tmp = NULL;
> > +
> 
> For a convenience of caller, we can have a src == NULL check here and return
> early.
> 
> > +    tmp = g_new0(virSGXCapability, 1);
> > +
> > +    tmp->flc = src->flc;
> > +    tmp->sgx1 = src->sgx1;
> > +    tmp->sgx2 = src->sgx2;
> > +    tmp->section_size = src->section_size;
> > +
> > +    if (src->nSections == 0) {
> > +        tmp->nSections = 0;
> > +        tmp->pSections = NULL;
> > +    } else {
> > +        tmp->nSections = src->nSections;
> > +        tmp->pSections = src->pSections;
> 
> Ouch, this will definitely lead to a double free. If I run qemucapabilitiestest
> after this patch I can see it clearly. I don't quite understand why you didn't
> though. Fortunately, we can use plain
> memcpy() since virSection struct does not contain any pointer, just a pair of
> integers.
> 
> > +    }
> > +
> > +    *dst = g_steal_pointer(&tmp);
> > +    return 0;
> > +}
> > +
> > +
> >  static void
> >  virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
> >                                   virQEMUCapsAccel *src) @@ -2053,6
> > +2083,12 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps
> *qemuCaps)
> >                                 qemuCaps->sevCapabilities) < 0)
> >          return NULL;
> >
> > +
> > +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) &&
> > +        virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities,
> > +                               qemuCaps->sgxCapabilities) < 0)
> > +        return NULL;
> > +
> >      return g_steal_pointer(&ret);
> >  }
> >
> > @@ -2091,6 +2127,7 @@ void virQEMUCapsDispose(void *obj)
> >      virCPUDataFree(qemuCaps->cpuData);
> >
> >      virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
> > +    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
> >
> >      virQEMUCapsAccelClear(&qemuCaps->kvm);
> >      virQEMUCapsAccelClear(&qemuCaps->hvf);
> > @@ -2616,6 +2653,13 @@ virQEMUCapsGetSEVCapabilities(virQEMUCaps
> > *qemuCaps)  }
> >
> >
> > +virSGXCapabilityPtr
> > +virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps) {
> > +    return qemuCaps->sgxCapabilities; }
> > +
> > +
> >  static int
> >  virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
> >                              qemuMonitor *mon) @@ -3442,6 +3486,31 @@
> > virQEMUCapsProbeQMPSEVCapabilities(virQEMUCaps *qemuCaps,  }
> >
> >
> > +static int
> > +virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qemuCaps,
> > +                                   qemuMonitor *mon) {
> > +    int rc = -1;
> > +    virSGXCapability *caps = NULL;
> > +
> > +    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
> > +        return 0;
> > +
> > +    if ((rc = qemuMonitorGetSGXCapabilities(mon, &caps)) < 0)
> > +        return -1;
> > +
> > +    /* SGX isn't actually supported */
> > +    if (rc == 0) {
> > +        virQEMUCapsClear(qemuCaps, QEMU_CAPS_SGX_EPC);
> > +        return 0;
> > +    }
> > +
> > +    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
> > +    qemuCaps->sgxCapabilities = caps;
> > +    return 0;
> > +}
> > +
> > +
> >  /*
> >   * Filter for features which should never be passed to QEMU. Either
> because
> >   * QEMU never supported them or they were dropped as they never did
> > anything @@ -4220,6 +4289,116 @@
> virQEMUCapsParseSEVInfo(virQEMUCaps
> > *qemuCaps, xmlXPathContextPtr ctxt)  }
> >
> >
> > +static int
> > +virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
> > +                        xmlXPathContextPtr ctxt) {
> > +    g_autoptr(virSGXCapability) sgx = NULL;
> > +    xmlNodePtr node;
> > +
> > +    g_autofree xmlNodePtr *nodes = NULL;
> > +    g_autofree xmlNodePtr *sectionNodes = NULL;
> > +    g_autofree char *flc = NULL;
> > +    g_autofree char *sgx1 = NULL;
> > +    g_autofree char *sgx2 = NULL;
> > +
> > +    int n = 0;
> > +    int nsections = 0;
> 
> No need for extra empty lines. It's okay if this is one block.
> 
> > +
> > +    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
> > +        return 0;
> > +
> > +    if (virXPathBoolean("boolean(./sgx)", ctxt) == 0) {
> > +        virReportError(VIR_ERR_XML_ERROR, "%s",
> > +                       _("missing SGX platform data in QEMU capabilities cache"));
> > +        return -1;
> > +    }
> > +
> > +    sgx = g_new0(virSGXCapability, 1);
> > +
> > +    if ((!(flc = virXPathString("string(./sgx/flc)", ctxt))) ||
> > +        virStringParseYesNo(flc, &sgx->flc) < 0) {
> > +        virReportError(VIR_ERR_XML_ERROR, "%s",
> > +                       _("missing or invalid SGX platform flc in QEMU capabilities
> cache"));
> > +        return -1;
> > +    }
> > +
> > +    if ((!(sgx1 = virXPathString("string(./sgx/sgx1)", ctxt))) ||
> > +        virStringParseYesNo(sgx1, &sgx->sgx1) < 0) {
> > +        virReportError(VIR_ERR_XML_ERROR, "%s",
> > +                       _("missing or invalid SGX platform sgx1 in QEMU capabilities
> cache"));
> > +        return -1;
> > +    }
> > +
> > +    if ((!(sgx2 = virXPathString("string(./sgx/sgx2)", ctxt))) ||
> > +        virStringParseYesNo(sgx2, &sgx->sgx2) < 0) {
> > +        virReportError(VIR_ERR_XML_ERROR, "%s",
> > +                       _("missing or invalid SGX platform sgx2 in QEMU capabilities
> cache"));
> > +        return -1;
> > +    }
> > +
> > +    if (virXPathULongLong("string(./sgx/section_size)", ctxt, &sgx-
> >section_size) < 0) {
> > +        virReportError(VIR_ERR_XML_ERROR, "%s",
> > +                       _("missing or malformed SGX platform section_size in QEMU
> capabilities cache"));
> > +        return -1;
> > +    }
> > +
> > +    if ((n = virXPathNodeSet("./sgx/sections", ctxt, &nodes)) < 0) {
> 
> Here, were intrested in a single occurrance, thus virXPathNode() could be
> used.
> 
> > +        sgx->nSections = 0;
> > +        sgx->pSections = NULL;
> > +        VIR_INFO("Sections was not obtained, so QEMU version is
> > + 6.2.0");
> 
> Again, no need for extra NOPs, VIR_INFO()...
> 
> > +        qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> > +        return 0;
> > +    }
> > +
> > +    if (n == 0) {
> > +        qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> > +        return 0;
> > +    }
> > +
> > +    // Got the section, the QEMU version is above 7.0.0
> 
> We like c89 style of comments.
> 
> > +    node = ctxt->node;
> > +    ctxt->node = nodes[0];
> > +    nsections = virXPathNodeSet("./section", ctxt, &sectionNodes);
> > +    ctxt->node = node;
> > +
> > +    if (nsections < 0) {
> > +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                       _("failed to parse CPU blockers in QEMU capabilities"));
> > +        return -1;
> > +    }
> > +
> > +    if (nsections > 0) {
> > +        size_t i;
> > +        g_autofree char * strNode = NULL;
> > +        g_autofree char * strSize = NULL;
> > +        sgx->nSections = nsections;
> > +        sgx->pSections = g_new0(virSection, nsections + 1);
> > +
> > +        for (i = 0; i < nsections; i++) {
> > +            if ((strNode = virXMLPropString(sectionNodes[i], "node")) &&
> > +                (virStrToLong_ui(strNode, NULL, 10, &(sgx->pSections[i].node)) <
> 0)) {
> > +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                                _("missing node name in QEMU "
> > +                                    "capabilities cache"));
> 
> Error messages are extempt from 80 chars line rule. The reason is:
> simpler git-grep. I, as a developer, can take whatever portion of error
> message and 'git grep' it and find it easily. But if the message is broken into
> multiple lines it's more tricky to do.
> 
> > +                return -1;
> > +            }
> > +
> > +            if ((strSize = virXMLPropString(sectionNodes[i], "size")) &&
> > +                (virStrToLong_ull(strSize, NULL, 10, &(sgx->pSections[i].size)) < 0))
> {
> > +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> > +                                _("missing size name in QEMU "
> > +                                    "capabilities cache"));
> > +                return -1;
> > +            }
> > +        }
> > +    }
> > +
> > +    qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> > +    return 0;
> > +}
> > +
> > +
> >  static int
> >  virQEMUCapsParseFlags(virQEMUCaps *qemuCaps, xmlXPathContextPtr
> ctxt)
> > { @@ -4522,6 +4701,9 @@ virQEMUCapsLoadCache(virArch hostArch,
> >      if (virQEMUCapsParseSEVInfo(qemuCaps, ctxt) < 0)
> >          return -1;
> >
> > +    if (virQEMUCapsParseSGXInfo(qemuCaps, ctxt) < 0)
> > +        return -1;
> > +
> >      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
> >          virQEMUCapsInitHostCPUModel(qemuCaps, hostArch,
> VIR_DOMAIN_VIRT_KVM);
> >      if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_HVF)) @@ -4707,6
> +4889,49
> > @@ virQEMUCapsFormatSEVInfo(virQEMUCaps *qemuCaps, virBuffer
> *buf)  }
> >
> >
> > +static void
> > +virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
> > +                         virBuffer *buf) {
> > +    virSGXCapabilityPtr sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
> > +    size_t i;
> > +
> > +    virBufferAddLit(buf, "<sgx supported='yes'>\n");
> > +    virBufferAdjustIndent(buf, 2);
> > +    if (sgx->flc) {
> > +        virBufferAsprintf(buf, "<flc>%s</flc>\n", "yes");
> > +    } else {
> > +        virBufferAsprintf(buf, "<flc>%s</flc>\n", "no");
> > +    }
> 
> Well, this works. But how about:
> 
> if (sgx->flc) {
>   virBufferAddLit(buf, "<flc>yes</flc>\n"); } else {
>   virBufferAddLit(buf, "<flc>no</flc>\n"); }
> 
> which saves and extra call to printf() for a static string? Or even better:
> 
>   virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
> 
> > +    if (sgx->sgx1) {
> > +        virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "yes");
> > +    } else {
> > +        virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "no");
> > +    }
> > +    if (sgx->sgx2) {
> > +        virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "yes");
> > +    } else {
> > +        virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "no");
> > +    }
> > +    virBufferAsprintf(buf, "<section_size
> > + unit='KiB'>%llu</section_size>\n", sgx->section_size);
> > +
> > +    if (sgx->nSections > 0) {
> > +        virBufferAddLit(buf, "<sections>\n");
> > +
> > +        for (i = 0; i < sgx->nSections; i++) {
> > +            virBufferAdjustIndent(buf, 2);
> > +            virBufferAsprintf(buf, "<section node='%u' ", sgx-
> >pSections[i].node);
> > +            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->pSections[i].size);
> > +            virBufferAdjustIndent(buf, -2);
> > +        }
> > +        virBufferAddLit(buf, "</sections>\n");
> > +    }
> > +
> > +    virBufferAdjustIndent(buf, -2);
> > +    virBufferAddLit(buf, "</sgx>\n"); }
> > +
> > +
> >  char *
> >  virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)  { @@ -4788,6
> +5013,9
> > @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
> >      if (qemuCaps->sevCapabilities)
> >          virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
> >
> > +    if (qemuCaps->sgxCapabilities)
> > +        virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
> > +
> >      if (qemuCaps->kvmSupportsNesting)
> >          virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
> >
> > @@ -5455,6 +5683,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps
> *qemuCaps,
> >          return -1;
> >      if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
> >          return -1;
> > +    if (virQEMUCapsProbeQMPSGXCapabilities(qemuCaps, mon) < 0)
> > +        return -1;
> >
> >      virQEMUCapsInitProcessCaps(qemuCaps);
> >
> > diff --git a/src/qemu/qemu_capabilities.h
> > b/src/qemu/qemu_capabilities.h index 6f35ba1485..fc8c0fde1b 100644
> > --- a/src/qemu/qemu_capabilities.h
> > +++ b/src/qemu/qemu_capabilities.h
> > @@ -650,6 +650,7 @@ typedef enum { /* virQEMUCapsFlags grouping
> marker for syntax-check */
> >      QEMU_CAPS_CHARDEV_QEMU_VDAGENT, /* -chardev qemu-vdagent
> */
> >      QEMU_CAPS_DISPLAY_DBUS, /* -display dbus */
> >      QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX, /* -object
> > iothread.thread-pool-max */
> > +    QEMU_CAPS_SGX_EPC, /* -object sgx-epc,... */
> >
> >      QEMU_CAPS_LAST /* this must always be the last item */  }
> > virQEMUCapsFlags; @@ -843,6 +844,9 @@
> > virQEMUCapsCPUFeatureFromQEMU(virQEMUCaps *qemuCaps,
> virSEVCapability
> > *  virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps);
> >
> > +virSGXCapabilityPtr
> > +virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps);
> > +
> >  bool
> >  virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps)
> > G_GNUC_NO_INLINE;
> >
> > diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> > b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> > index e235532d62..0151ab07fa 100644
> > --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> > +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
> > @@ -7459,15 +7459,15 @@
> >            "type": "bool"
> >          },
> >          {
> > -          "name": "sgx1",
> > +          "name": "flc",
> >            "type": "bool"
> >          },
> >          {
> > -          "name": "sgx2",
> > +          "name": "sgx1",
> >            "type": "bool"
> >          },
> >          {
> > -          "name": "flc",
> > +          "name": "sgx2",
> >            "type": "bool"
> >          },
> >          {
> 
> This move does not seem to be warranted. When Peter generated the file
> I'm quite certain that this was genuine order of attributes in which QEMU
> replied. Furthermore, nothing in our code relies on ordering of these
> particular attributes. Why is this necessary?
> 
> In fact, the QEMU I've built from git recently (v7.0.0-2668-gf9d9fff72e)
> replied in this order:
> 
> {"return": {"sgx": true, "sgx2": false, "sgx1": true, "sections":
> [{"size": 98041856, "node": 0}], "section-size": 98041856, "flc":
> false}, "id": "libvirt-50"}
> 
> Michal


From haibin.huang at intel.com  Mon Jul 25 02:36:42 2022
From: haibin.huang at intel.com (Huang, Haibin)
Date: Mon, 25 Jul 2022 02:36:42 +0000
Subject: [libvirt][PATCH v13 4/6] conf: expose SGX feature in domain
 capabilities
In-Reply-To: <fb74ca03-fac1-1631-a3ca-5be26c666d03@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-5-lin.a.yang@intel.com>
 <fb74ca03-fac1-1631-a3ca-5be26c666d03@redhat.com>
Message-ID: <MW4PR11MB5909092AEB9E64015AF6218991959@MW4PR11MB5909.namprd11.prod.outlook.com>

Ok, nice comments

Thank you very much!

> -----Original Message-----
> From: Michal Pr?vozn?k <mprivozn at redhat.com>
> Sent: Wednesday, July 20, 2022 7:27 PM
> To: Yang, Lin A <lin.a.yang at intel.com>; libvir-list at redhat.com; Huang, Haibin
> <haibin.huang at intel.com>; Ding, Jian-feng <jian-feng.ding at intel.com>
> Subject: Re: [libvirt][PATCH v13 4/6] conf: expose SGX feature in domain
> capabilities
> 
> On 7/1/22 21:14, Lin Yang wrote:
> > From: Haibin Huang <haibin.huang at intel.com>
> >
> > Extend hypervisor capabilities to include sgx feature. When available,
> > the hypervisor supports launching an VM with SGX on Intel platfrom.
> > The SGX feature tag privides additional details like section size and
> > sgx1 or sgx2.
> >
> > Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> > Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> > ---
> >  docs/formatdomaincaps.rst                     | 40 ++++++++++++++++
> >  src/conf/domain_capabilities.c                | 48 +++++++++++++++++++
> >  src/conf/schemas/domaincaps.rng               | 42 ++++++++++++++++
> >  src/qemu/qemu_capabilities.c                  | 28 +++++++++++
> >  tests/domaincapsdata/bhyve_basic.x86_64.xml   |  1 +
> >  tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |  1 +
> >  tests/domaincapsdata/bhyve_uefi.x86_64.xml    |  1 +
> >  tests/domaincapsdata/empty.xml                |  1 +
> >  tests/domaincapsdata/libxl-xenfv.xml          |  1 +
> >  tests/domaincapsdata/libxl-xenpv.xml          |  1 +
> >  .../domaincapsdata/qemu_2.11.0-q35.x86_64.xml |  1 +
> > .../domaincapsdata/qemu_2.11.0-tcg.x86_64.xml |  1 +
> >  tests/domaincapsdata/qemu_2.11.0.s390x.xml    |  1 +
> >  tests/domaincapsdata/qemu_2.11.0.x86_64.xml   |  1 +
> >  .../domaincapsdata/qemu_2.12.0-q35.x86_64.xml |  1 +
> > .../domaincapsdata/qemu_2.12.0-tcg.x86_64.xml |  1 +
> >  .../qemu_2.12.0-virt.aarch64.xml              |  1 +
> >  tests/domaincapsdata/qemu_2.12.0.aarch64.xml  |  1 +
> >  tests/domaincapsdata/qemu_2.12.0.ppc64.xml    |  1 +
> >  tests/domaincapsdata/qemu_2.12.0.s390x.xml    |  1 +
> >  tests/domaincapsdata/qemu_2.12.0.x86_64.xml   |  1 +
> >  .../domaincapsdata/qemu_3.0.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  |  1 +
> >  tests/domaincapsdata/qemu_3.0.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_3.0.0.s390x.xml     |  1 +
> >  tests/domaincapsdata/qemu_3.0.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |  1 +
> >  tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |  1 +
> >  .../qemu_4.0.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_4.0.0.s390x.xml     |  1 +
> >  tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  1 +
> >  tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  1 +
> >  .../qemu_4.2.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_4.2.0.s390x.xml     |  1 +
> >  tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
> >  .../qemu_5.0.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  1 +
> >  tests/domaincapsdata/qemu_5.1.0.sparc.xml     |  1 +
> >  tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |  1 +
> >  .../qemu_5.2.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_5.2.0.s390x.xml     |  1 +
> >  tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |  1 +
> >  .../qemu_6.0.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_6.0.0.s390x.xml     |  1 +
> >  tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |  1 +
> > .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |  1 +
> >  tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |  1 +
> >  .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  6 +++
> > .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  6 +++
> >  .../qemu_6.2.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  6 +++
> >  .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 10 ++++
> > .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 10 ++++
> >  .../qemu_7.0.0-virt.aarch64.xml               |  1 +
> >  tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |  1 +
> >  tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |  1 +
> >  tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 10 ++++
> >  .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 10 ++++
> > .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 10 ++++
> >  tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 10 ++++
> >  88 files changed, 311 insertions(+)
> >
> > diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
> > index 933469b2a2..d3bdee28d4 100644
> > --- a/docs/formatdomaincaps.rst
> > +++ b/docs/formatdomaincaps.rst
> > @@ -519,6 +519,16 @@ capabilities. All features occur as children of the
> main ``features`` element.
> >           <cbitpos>47</cbitpos>
> >           <reduced-phys-bits>1</reduced-phys-bits>
> >         </sev>
> > +       <sgx supported='yes'>
> > +         <flc>no</flc>
> > +         <sgx1>yes</sgx1>
> > +         <sgx2>no</sgx2>
> > +         <section_size>2</section_size>
> > +         <sections>
> > +           <section node='0' size='1'/>
> > +           <section node='1' size='1'/>
> > +         </sections>
> > +       </sgx>
> >       </features>
> >     </domainCapabilities>
> >
> > @@ -598,3 +608,33 @@ in domain XML
> > <formatdomain.html#launch-security>`__
> >  ``maxESGuests``
> >     The maximum number of SEV-ES guests that can be launched on the host.
> This
> >     value may be configurable in the firmware for some hosts.
> > +
> > +SGX capabilities
> > +^^^^^^^^^^^^^^^^
> > +
> > +Intel Software Guard Extensions (Intel SGX) capabilities are exposed
> > +under the ``sgx`` element.
> > +
> > +Intel SGX helps protect data in use via unique application isolation
> technology.
> > +Protect selected code and data from modification using hardened
> > +enclaves with Intel SGX.
> > +
> > +For more details on the SGX feature, please follow resources in the
> > +SGX developer's document store. In order to use SGX with libvirt have
> > +a look at formatdomain.rst Memory devices.
> > +
> > +``flc``
> > +   FLC (Flexible Launch Control), not strictly part of SGX2, but was not part
> of
> > +   original SGX hardware either.
> > +
> > +``sgx1``
> > +   the sgx version 1.
> > +
> > +``sgx2``
> > +   The sgx version 2.
> > +
> > +``section_size``
> > +   The size of the SGX enclave page cache (called EPC).
> > +
> > +``sections``
> > +   The sections of the SGX enclave page cache (called EPC).
> > diff --git a/src/conf/domain_capabilities.c
> > b/src/conf/domain_capabilities.c index 27f3fb8d36..fa29f69807 100644
> > --- a/src/conf/domain_capabilities.c
> > +++ b/src/conf/domain_capabilities.c
> > @@ -98,6 +98,7 @@ virDomainCapsDispose(void *obj)
> >      virObjectUnref(caps->cpu.custom);
> >      virCPUDefFree(caps->cpu.hostModel);
> >      virSEVCapabilitiesFree(caps->sev);
> > +    virSGXCapabilitiesFree(caps->sgx);
> >
> >      values = &caps->os.loader.values;
> >      for (i = 0; i < values->nvalues; i++) @@ -620,6 +621,52 @@
> > virDomainCapsFeatureSEVFormat(virBuffer *buf,
> >      return;
> >  }
> >
> > +static void
> > +virDomainCapsFeatureSGXFormat(virBuffer *buf,
> > +                              const virSGXCapability *sgx) {
> > +    size_t i;
> > +
> > +    if (!sgx) {
> > +        virBufferAddLit(buf, "<sgx supported='no'/>\n");
> > +    } else {
> > +        virBufferAddLit(buf, "<sgx supported='yes'>\n");
> > +        virBufferAdjustIndent(buf, 2);
> > +        if (sgx->flc) {
> > +            virBufferAsprintf(buf, "<flc>%s</flc>\n", "yes");
> > +        } else {
> > +            virBufferAsprintf(buf, "<flc>%s</flc>\n", "no");
> > +        }
> 
> Same comment here as in the previous patch.
> 
> > +        if (sgx->sgx1) {
> > +            virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "yes");
> > +        } else {
> > +            virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", "no");
> > +        }
> > +        if (sgx->sgx2) {
> > +            virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "yes");
> > +        } else {
> > +            virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", "no");
> > +        }
> > +        virBufferAsprintf(buf, "<section_size
> > + unit='KiB'>%llu</section_size>\n", sgx->section_size);
> > +
> > +        if (sgx->nSections > 0) {
> > +            virBufferAddLit(buf, "<sections>\n");
> > +
> > +            for (i = 0; i < sgx->nSections; i++) {
> > +                virBufferAdjustIndent(buf, 2);
> > +                virBufferAsprintf(buf, "<section node='%u' ", sgx-
> >pSections[i].node);
> > +                virBufferAsprintf(buf, "size='%llu'/>\n", sgx->pSections[i].size);
> > +                virBufferAdjustIndent(buf, -2);
> > +            }
> > +            virBufferAddLit(buf, "</sections>\n");
> > +        }
> > +
> > +        virBufferAdjustIndent(buf, -2);
> > +        virBufferAddLit(buf, "</sgx>\n");
> > +    }
> > +
> > +    return;
> > +}
> >
> >  static void
> >  virDomainCapsFormatFeatures(const virDomainCaps *caps, @@ -640,6
> > +687,7 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps,
> >      }
> >
> >      virDomainCapsFeatureSEVFormat(&childBuf, caps->sev);
> > +    virDomainCapsFeatureSGXFormat(&childBuf, caps->sgx);
> >
> >      virXMLFormatElement(buf, "features", NULL, &childBuf);  } diff
> > --git a/src/conf/schemas/domaincaps.rng
> > b/src/conf/schemas/domaincaps.rng index 9cbc2467ab..6975ebacb9
> 100644
> > --- a/src/conf/schemas/domaincaps.rng
> > +++ b/src/conf/schemas/domaincaps.rng
> > @@ -270,6 +270,9 @@
> >        <optional>
> >          <ref name="sev"/>
> >        </optional>
> > +      <optional>
> > +        <ref name="sgx"/>
> > +      </optional>
> >      </element>
> >    </define>
> >
> > @@ -330,6 +333,45 @@
> >      </element>
> >    </define>
> >
> > +  <define name="sgx">
> > +    <element name="sgx">
> > +      <ref name="supported"/>
> > +      <optional>
> > +        <element name="flc">
> > +          <data type="string"/>
> 
> Or, since we know we are formatting yes/no, we can use virYesNo instead of
> too generic string type.
> 
> > +        </element>
> > +        <element name="sgx1">
> > +          <data type="string"/>
> > +        </element>
> > +        <element name="sgx2">
> > +          <data type="string"/>
> > +        </element>
> > +        <element name="section_size">
> > +          <attribute name="unit">
> > +            <value>KiB</value>
> > +          </attribute>
> > +          <data type="unsignedInt"/>
> > +        </element>
> > +        <optional>
> > +          <element name="sections">
> > +            <interleave>
> 
> I think the order is well defined and thus we don't really need <interleave/>
> here. The domain capabilities XML is not provided by user, it's generated by
> libvirt, in virDomainCapsFormat() where the order is well defined.
> 
> > +              <zeroOrMore>
> > +                <element name="section">
> > +                  <attribute name="node">
> > +                    <data type="string"/>
> 
> This is an integer ..
> 
> > +                  </attribute>
> > +                  <attribute name="size">
> > +                    <data type="string"/>
> 
> .. and so is this.
> 
> > +                  </attribute>
> > +                </element>
> > +              </zeroOrMore>
> > +            </interleave>
> > +          </element>
> > +        </optional>
> > +      </optional>
> > +    </element>
> > +  </define>
> > +
> >    <define name="value">
> >      <zeroOrMore>
> >        <element name="value">
> > diff --git a/src/qemu/qemu_capabilities.c
> > b/src/qemu/qemu_capabilities.c index 57b5acb150..598c694738 100644
> > --- a/src/qemu/qemu_capabilities.c
> > +++ b/src/qemu/qemu_capabilities.c
> > @@ -6744,6 +6744,33 @@
> virQEMUCapsFillDomainFeatureS390PVCaps(virQEMUCaps *qemuCaps,
> >      }
> >  }
> >
> > +/**
> > + * virQEMUCapsFillDomainFeatureiSGXCaps:
> > + * @qemuCaps: QEMU capabilities
> > + * @domCaps: domain capabilities
> > + *
> > + * Take the information about SGX capabilities that has been obtained
> > + * using the 'query-sgx-capabilities' QMP command and stored in
> > + at qemuCaps
> > + * and convert it to a form suitable for @domCaps.
> > + */
> > +static void
> > +virQEMUCapsFillDomainFeatureSGXCaps(virQEMUCaps *qemuCaps,
> > +                                    virDomainCaps *domCaps) {
> > +    virSGXCapability *cap = qemuCaps->sgxCapabilities;
> > +
> > +    if (!cap)
> > +        return;
> > +
> > +    domCaps->sgx = g_new0(virSGXCapability, 1);
> > +
> > +    domCaps->sgx->flc = cap->flc;
> > +    domCaps->sgx->sgx1 = cap->sgx1;
> > +    domCaps->sgx->sgx2 = cap->sgx2;
> > +    domCaps->sgx->section_size = cap->section_size;
> > +    domCaps->sgx->nSections = cap->nSections;
> > +    domCaps->sgx->pSections = cap->pSections;
> 
> This is a verbatim copy of virQEMUCapsSGXInfoCopy(), any reason for not
> just call the function?
> 
> > +}
> 
> Michal


From mprivozn at redhat.com  Mon Jul 25 07:20:54 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 09:20:54 +0200
Subject: [PATCH v2] virsh: Require --xpath for *dumpxml
In-Reply-To: <58c318eb973da98b775762ff42451af883413ff3.1657285230.git.mprivozn@redhat.com>
References: <58c318eb973da98b775762ff42451af883413ff3.1657285230.git.mprivozn@redhat.com>
Message-ID: <e579cb94-0dfe-895e-38c7-2cc6e87e0c6f@redhat.com>

On 7/8/22 15:01, Michal Privoznik wrote:
>

Ping? Might be worth merging before tomorrow's freeze.

Michal


From eskultet at redhat.com  Mon Jul 25 07:24:39 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Mon, 25 Jul 2022 09:24:39 +0200
Subject: [PATCH 1/3] ci: Move builds from alpine-314 to alpine-315
In-Reply-To: <d8b143120bbb1325c6e25fbe5d8e2084394de5d0.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <d8b143120bbb1325c6e25fbe5d8e2084394de5d0.1658486845.git.pkrempa@redhat.com>
Message-ID: <Yt5FNxV3ymjoOrAA@ridgehead>

On Fri, Jul 22, 2022 at 12:55:58PM +0200, Peter Krempa wrote:
> 'lcitool' dropped alpine-314
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
Reviewed-by: Erik Skultety <eskultet at redhat.com>


From eskultet at redhat.com  Mon Jul 25 07:25:46 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Mon, 25 Jul 2022 09:25:46 +0200
Subject: [PATCH 2/3] ci: Move active Debian-10 jobs to Debian-11
In-Reply-To: <9d816f6901027a429572867b8274f6d04358a941.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <9d816f6901027a429572867b8274f6d04358a941.1658486845.git.pkrempa@redhat.com>
Message-ID: <Yt5FemaaQwyRhSjI@ridgehead>

On Fri, Jul 22, 2022 at 12:55:59PM +0200, Peter Krempa wrote:
> Debian 10 will reach EOL in august of 2022 and thus libvirt will no
> longer target it. Move CI jobs over to Debian-11.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
Reviewed-by: Erik Skultety <eskultet at redhat.com>


From pkrempa at redhat.com  Mon Jul 25 07:27:24 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 09:27:24 +0200
Subject: [PATCH v2] virsh: Require --xpath for *dumpxml
In-Reply-To: <58c318eb973da98b775762ff42451af883413ff3.1657285230.git.mprivozn@redhat.com>
References: <58c318eb973da98b775762ff42451af883413ff3.1657285230.git.mprivozn@redhat.com>
Message-ID: <Yt5F3MH7p8tSNEVd@angien.pipo.sk>

On Fri, Jul 08, 2022 at 15:01:50 +0200, Michal Privoznik wrote:
> Historically, the dumpxml command reject any unknown arguments,
> for instance:
> 
>     virsh dumpxml fedora xxx
> 
> However, after v8.5.0-rc1~31 the second argument ('xxx') is
> treated as an XPath, but it's not that clearly visible.
> Therefore, require the --xpath switch, like this:
> 
>     virsh dumpxml fedora --xpath xxx
> 
> Yes, this breaks already released virsh, but I think we can argue
> that the pool of users of this particular function is very small.
> We also document the argument being mandatory:
> 
>    dumpxml [--inactive] [--security-info] [--update-cpu] [--migratable]
>            [--xpath EXPRESSION] [--wrap] domain
> 
> The sooner we do this change, the better.
> 
> The same applies for other *dumpxml functions (net-dumpxml,
> pool-dumpxml, vol-dumpxl to name a few).
> 
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2103524
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From mprivozn at redhat.com  Mon Jul 25 07:29:56 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 09:29:56 +0200
Subject: [libvirt][PATCH v13 3/6] Convert QMP capabilities to domain
 capabilities
In-Reply-To: <MW4PR11MB5909B50226B9A783D694AC0591959@MW4PR11MB5909.namprd11.prod.outlook.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-4-lin.a.yang@intel.com>
 <0040ffc0-ab7a-3044-2dfa-866cf1d50623@redhat.com>
 <MW4PR11MB5909B50226B9A783D694AC0591959@MW4PR11MB5909.namprd11.prod.outlook.com>
Message-ID: <ffe8fc4b-376f-0aa9-cab7-d6cad6bb360a@redhat.com>

On 7/25/22 03:31, Huang, Haibin wrote:
> Hi Michal Peter,
> 
> Thank you for your comments.
> 
> Way 1:
> virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
> 
> Way 2:
>     if (sgx->flc) {
>         virBufferAsprintf(buf, "<flc>yes</flc>\n");
>     } else {
>         virBufferAsprintf(buf, "<flc>yes</flc>\n");
>     }
> 
> For this section, both ways of writing work.
> 
> Peter Krempa said: "Don't use the ternary operator ('?'), use a full if/else branch instead or pick a better data structure."
> You mean to be more concise use the ternary operator ('?').

Yeah, this one should be exempt from our ternary operator rule. The idea
behin the rule is to avoid complicated (or even composed) expressions
with a ternary operator. However, this is not the case and in fact,
ternary operator makes the code more readable. And we already use this
pattern for formatting other booleans, indeed.

We may switch to virTristateBool but one can argue that FLC is not
really tristate, it's either present or not; there's no _ABSENT state.
On the other hand, we may assign _ABSENT special meaning - the structure
was just allocated and does not hold decisive answer for FLC presence.

So let me switch to virTristateBool.

BTW: I've discussed with Yang that I'll fix up these patches and resend.
Is that agreement still on?

Michal


From eskultet at redhat.com  Mon Jul 25 07:39:03 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Mon, 25 Jul 2022 09:39:03 +0200
Subject: [PATCH 3/3] ci: Drop Debian 10
In-Reply-To: <1ebe84e14e48e44ae35b467b498d693960e388ee.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <1ebe84e14e48e44ae35b467b498d693960e388ee.1658486845.git.pkrempa@redhat.com>
Message-ID: <Yt5Il9RofXqZ/Iqx@ridgehead>

On Fri, Jul 22, 2022 at 12:56:00PM +0200, Peter Krempa wrote:
> Debian 10 reaches EOL in August of 2022.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>

While I don't have a serious issue with this patch which also conforms to our
platform policy I don't think we need to always be so keen on dropping
platforms ASAP manually. IOW I think all platform changes should be ideally be
performed with lcitool, which however, won't be able to drop Debian 10 so soon
sice QEMU will still likely rely on Debian 10 in their CI for a while unless
matters around platform support have changed in QEMU??. Since you moved the CI
workloads to Debian 11 in patch 2, leaving Debian 10 merely an optional job
doesn't particularly harm anything.

If nobody has any any objections against manually handling platform support
rather than with lcitool, FWIW:

# after the release
Reviewed-by: Erik Skultety <eskultet at redhat.com>


From abologna at redhat.com  Mon Jul 25 08:20:56 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Mon, 25 Jul 2022 04:20:56 -0400
Subject: [PATCH 3/3] ci: Drop Debian 10
In-Reply-To: <Yt5Il9RofXqZ/Iqx@ridgehead>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <1ebe84e14e48e44ae35b467b498d693960e388ee.1658486845.git.pkrempa@redhat.com>
 <Yt5Il9RofXqZ/Iqx@ridgehead>
Message-ID: <CABJz62OncTNpBVap-iHXQeVrZ+7PuFcBnM=47-aJsgwpFvwj1Q@mail.gmail.com>

On Mon, Jul 25, 2022 at 09:39:03AM +0200, Erik Skultety wrote:
> On Fri, Jul 22, 2022 at 12:56:00PM +0200, Peter Krempa wrote:
> > Debian 10 reaches EOL in August of 2022.
>
> While I don't have a serious issue with this patch which also conforms to our
> platform policy I don't think we need to always be so keen on dropping
> platforms ASAP manually. IOW I think all platform changes should be ideally be
> performed with lcitool, which however, won't be able to drop Debian 10 so soon
> sice QEMU will still likely rely on Debian 10 in their CI for a while unless
> matters around platform support have changed in QEMU??.

QEMU has the same platform support policy as libvirt these days, but
their release schedule is different and that can result in keeping a
target platform around for a few additional months.

This influences how soon we can drop the platform in question from
lcitool, but shouldn't affect libvirt: from libvirt's point of view,
dropping a target platform is just a matter of updating the manifest,
and there is no compelling reason to wait until lcitool has dropped
support for it.

If anything, it's more convenient to do it *before* that has
happened, as in that case you can just run 'lcitool manifest' and
have the tool dutifully delete the now-unused files for you instead
of having to hunt them down manually :)

-- 
Andrea Bolognani / Red Hat / Virtualization


From abologna at redhat.com  Mon Jul 25 08:22:59 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Mon, 25 Jul 2022 04:22:59 -0400
Subject: [PATCH 1/3] ci: Move builds from alpine-314 to alpine-315
In-Reply-To: <d8b143120bbb1325c6e25fbe5d8e2084394de5d0.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <d8b143120bbb1325c6e25fbe5d8e2084394de5d0.1658486845.git.pkrempa@redhat.com>
Message-ID: <CABJz62PvtNV_9TOBhtK4prVbqeo-RZM57bB-gZo=_29U4iRNhg@mail.gmail.com>

On Fri, Jul 22, 2022 at 12:55:58PM +0200, Peter Krempa wrote:
> +++ b/ci/manifest.yml
> @@ -19,12 +19,9 @@ targets:
>            RPM: skip
>            CC: clang
>
> -  alpine-314: x86_64
> -
>    alpine-315:
>      jobs:
>        - arch: x86_64
> -        builds: false

This makes for a cleaner diff, but you could also optimize for a more
minimal manifest and change the entry to

  alpine-315: x86_64

instead.

Either way,

  Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization


From abologna at redhat.com  Mon Jul 25 08:58:50 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Mon, 25 Jul 2022 04:58:50 -0400
Subject: [PATCH 2/3] ci: Move active Debian-10 jobs to Debian-11
In-Reply-To: <9d816f6901027a429572867b8274f6d04358a941.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <9d816f6901027a429572867b8274f6d04358a941.1658486845.git.pkrempa@redhat.com>
Message-ID: <CABJz62MzPX-t32+NXtDVtev92aNTP0EY39X6Mwb=RNJhRxeNSQ@mail.gmail.com>

On Fri, Jul 22, 2022 at 12:55:59PM +0200, Peter Krempa wrote:
> Debian 10 will reach EOL in august of 2022 and thus libvirt will no
> longer target it. Move CI jobs over to Debian-11.
>
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  ci/gitlab/builds.yml     | 4 ++--
>  ci/gitlab/containers.yml | 3 ++-
>  ci/manifest.yml          | 5 ++---
>  3 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization


From abologna at redhat.com  Mon Jul 25 08:59:10 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Mon, 25 Jul 2022 04:59:10 -0400
Subject: [PATCH 3/3] ci: Drop Debian 10
In-Reply-To: <1ebe84e14e48e44ae35b467b498d693960e388ee.1658486845.git.pkrempa@redhat.com>
References: <cover.1658486845.git.pkrempa@redhat.com>
 <1ebe84e14e48e44ae35b467b498d693960e388ee.1658486845.git.pkrempa@redhat.com>
Message-ID: <CABJz62M797sY99bxTR92c7JgtqLcwpQgnkt2Ecg7FmXRj2FDLw@mail.gmail.com>

On Fri, Jul 22, 2022 at 12:56:00PM +0200, Peter Krempa wrote:
> Debian 10 reaches EOL in August of 2022.
>
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  .../debian-10-cross-aarch64.Dockerfile        | 125 ------------------
>  .../debian-10-cross-armv6l.Dockerfile         | 124 -----------------
>  .../debian-10-cross-armv7l.Dockerfile         | 125 ------------------
>  ci/containers/debian-10-cross-i686.Dockerfile | 124 -----------------
>  ci/containers/debian-10-cross-mips.Dockerfile | 124 -----------------
>  .../debian-10-cross-mips64el.Dockerfile       | 124 -----------------
>  .../debian-10-cross-mipsel.Dockerfile         | 124 -----------------
>  .../debian-10-cross-ppc64le.Dockerfile        | 124 -----------------
>  .../debian-10-cross-s390x.Dockerfile          | 124 -----------------
>  ci/containers/debian-10.Dockerfile            | 105 ---------------
>  ci/gitlab/builds.yml                          | 119 -----------------
>  ci/gitlab/containers.yml                      |  80 -----------
>  ci/manifest.yml                               |  40 ------
>  13 files changed, 1462 deletions(-)
>  delete mode 100644 ci/containers/debian-10-cross-aarch64.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-armv6l.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-armv7l.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-i686.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-mips.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-mips64el.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-mipsel.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-ppc64le.Dockerfile
>  delete mode 100644 ci/containers/debian-10-cross-s390x.Dockerfile
>  delete mode 100644 ci/containers/debian-10.Dockerfile

Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization


From pkrempa at redhat.com  Mon Jul 25 10:27:48 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 12:27:48 +0200
Subject: [PATCH] cmdQemuMonitorCommandQMPWrap: Reset ignored errors from
 JSON parsing
In-Reply-To: <Yh8tPMl0cVJa5dZg@wheatley>
References: <a47e9b415f28f67e35d22acf2e9033d180c6d643.1646141608.git.pkrempa@redhat.com>
 <Yh8tPMl0cVJa5dZg@wheatley>
Message-ID: <Yt5wJFL3OAoorcXh@angien.pipo.sk>

On Wed, Mar 02, 2022 at 09:39:24 +0100, Martin Kletzander wrote:
> On Tue, Mar 01, 2022 at 02:33:28PM +0100, Peter Krempa wrote:
> > 'cmdQemuMonitorCommandQMPWrap' is checking whether the user provided
> > string is not valid JSON to avoid wrapping it. In cases where it's not
> > JSON we ignore the error and add the wrapper.
> > 
> > If the caller then reports a different non-libvirt error the error from
> > the JSON parsing would be printed as well. Reset errors we ignore:
> > 
> > # virsh qemu-monitor-command cd --pass-fds a asdf
> > error: Unable to parse FD number 'a'
> > error: internal error: cannot parse json asdf: lexical error: invalid char in json text.
> >                                        asdf
> >                      (right here) ------^
> > 
> > In the above case 'asdf' is not valid JSON, but the code did wrap it
> > into '{"execute":"asdf"}', the only problem is the argument for
> > --pass-fds.
> > 
> > Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> > ---
> > tools/virsh-domain.c | 4 ++++
> > 1 file changed, 4 insertions(+)
> > 
> > diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
> > index 9b1b14cdc2..743660e794 100644
> > --- a/tools/virsh-domain.c
> > +++ b/tools/virsh-domain.c
> > @@ -9769,6 +9769,8 @@ cmdQemuMonitorCommandQMPWrap(vshControl *ctl,
> >     if (virJSONValueIsObject(fullcmdjson))
> >         return g_steal_pointer(&fullcmd);
> > 
> > +    vshResetLibvirtError();
> > +
> >     /* we try to wrap the command and possible arguments into a JSON object, if
> >      * we as fall back we pass through what we've got from the user */
> > 
> > @@ -9787,6 +9789,8 @@ cmdQemuMonitorCommandQMPWrap(vshControl *ctl,
> >          * JSON object wrapper and try using that */
> >         g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
> > 
> > +        vshResetLibvirtError();
> > +
> 
> This is a little bit out of place and could be seen as confusing since
> it is here just because the error could be set in a function that's in
> an if condition.  I, for one, would vote for extracting that and making
> it more clear why that is, but this fixes the immediate issue, so

I've (trivially) re-structured the code so that vshResetLibvirtError
is done conditionally upon NULL return from virJSONValueFromString and
thus it makes it obvious what we are resetting.

> 
> Reviewed-by: Martin Kletzander <mkletzan at redhat.com>

Thanks!

From mprivozn at redhat.com  Mon Jul 25 12:34:33 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 14:34:33 +0200
Subject: [libvirt][PATCH v11 1/4] qemu: provide support to query the SGX
 capability
In-Reply-To: <YnvetoPPb1DlbYFC@angien.pipo.sk>
References: <20220511061112.2453344-1-lin.a.yang@intel.com>
 <20220511061112.2453344-2-lin.a.yang@intel.com>
 <YnvetoPPb1DlbYFC@angien.pipo.sk>
Message-ID: <f73662fc-4b3d-b027-718b-75c0b7b0e2f0@redhat.com>

On 5/11/22 18:05, Peter Krempa wrote:
> On Tue, May 10, 2022 at 23:11:09 -0700, Lin Yang wrote:
>> From: Haibin Huang <haibin.huang at intel.com>
>>
>> QEMU version >= 6.2.0 provides support for creating enclave on
>> SGX x86 platform using Software Guard Extensions (SGX) feature.
>> This patch adds support to query the SGX capability from the qemu.
>>
>> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
>> ---
>>  src/conf/domain_capabilities.c                |  10 ++
>>  src/conf/domain_capabilities.h                |  13 ++
>>  src/libvirt_private.syms                      |   1 +
>>  src/qemu/qemu_capabilities.c                  | 119 ++++++++++++++++++
>>  src/qemu/qemu_capabilities.h                  |   6 +
>>  src/qemu/qemu_capspriv.h                      |   4 +
>>  src/qemu/qemu_monitor.c                       |  10 ++
>>  src/qemu/qemu_monitor.h                       |   3 +
>>  src/qemu/qemu_monitor_json.c                  | 104 +++++++++++++--
>>  src/qemu/qemu_monitor_json.h                  |   9 ++
>>  .../caps_6.2.0.x86_64.replies                 |  22 +++-
>>  .../caps_6.2.0.x86_64.xml                     |   5 +
>>  .../caps_7.0.0.x86_64.replies                 |  22 +++-
>>  .../caps_7.0.0.x86_64.xml                     |   5 +
>>  14 files changed, 318 insertions(+), 15 deletions(-)
> 
> This is not a full review. Couple of points:
> 
> 1) Do not mix other changes with adding QEMU_CAPS* stuff
>     Basically theres waaay too much going on in this patch and it
>     definitely can be separated into smaller chunks. The QEMU_CAPS is
>     just one of them.
>     Separate at least:
>         - qemu monitor command introduction
>         - domain capabilities data structs for sgx
>         - parsing and formatting of the XML
>         - adding of the QEMU_CAPS_ flag
> 2) caps for qemu-7.1 were added very recently
>     You'll need to fix that one too since you added an extra query. Make
>     sure that you _don't_ add the faking of SXG into that file, but
>     rather the error case. My box doesn't support SGX so it will be
>     overwritten in my next refresh anyways.
> 
> [...]
> 
>> @@ -4706,6 +4805,21 @@ virQEMUCapsFormatSEVInfo(virQEMUCaps *qemuCaps, virBuffer *buf)
>>  }
>>  
>>  
>> +static void
>> +virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
>> +                         virBuffer *buf)
>> +{
>> +    virSGXCapabilityPtr sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
>> +
>> +    virBufferAddLit(buf, "<sgx>\n");
>> +    virBufferAdjustIndent(buf, 2);
>> +    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
> 
> Don't use the ternary operator ('?'), use a full if/else branch instead
> or pick a better data structure.

I wish our coding style was more forgiving about ternary operator.
Because in this specific case we have bad and worse options:

1) Expand to if-else fully:

  if (boolVar)
    virBufferAddLit(buf, "<elem>yes</elem>\n");
  else
    virBufferAddLit(buf, "<elem>no</elem>\n");

2) use virTristateBoolFromBool()

  virBufferAsprintf(buf, "<elem>%s</elem>\n",
virTristateBoolTypeToString(virTristateBoolFromBool(boolVar)));

3) use a temporary variable:

   char *tmp;
   if (boolVar)
     tmp = "yes";
   else
     tmp = "no";

  virBufferAsprintf(buf, "<elem>%s</elem>\n", tmp);

4) use virTristateBool:

  if (virTristateVar)
    virBudderAsprintf(buf, "<elem>%s</elem>\n",
virTristateBoolTypeToSring(virTristateVar));

5) Introduce a helper, e.g.

const char *
virYesNoString(bool val) {
  if (val)
    return "yes";
  return "no";
}

  virBufferAsprintf(buf, "<elem>%s</elem>\n", virYesNoString(boolVar));

Frankly speaking, I dislike 2) the most, followed by 1, 3, 4, 5.
According to my understanding, we discourage use of ternary operator
because it can lead to hard to parse expressions. But one can hardly
argue about bool ? "yes" : "no" being hard to parse.

Michal


From berrange at redhat.com  Mon Jul 25 12:37:48 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 25 Jul 2022 13:37:48 +0100
Subject: [libvirt][PATCH v11 1/4] qemu: provide support to query the SGX
 capability
In-Reply-To: <f73662fc-4b3d-b027-718b-75c0b7b0e2f0@redhat.com>
References: <20220511061112.2453344-1-lin.a.yang@intel.com>
 <20220511061112.2453344-2-lin.a.yang@intel.com>
 <YnvetoPPb1DlbYFC@angien.pipo.sk>
 <f73662fc-4b3d-b027-718b-75c0b7b0e2f0@redhat.com>
Message-ID: <Yt6OnDsmSq8vb+a8@redhat.com>

On Mon, Jul 25, 2022 at 02:34:33PM +0200, Michal Pr?vozn?k wrote:
> On 5/11/22 18:05, Peter Krempa wrote:
> > On Tue, May 10, 2022 at 23:11:09 -0700, Lin Yang wrote:
> >> From: Haibin Huang <haibin.huang at intel.com>
> >>
> >> QEMU version >= 6.2.0 provides support for creating enclave on
> >> SGX x86 platform using Software Guard Extensions (SGX) feature.
> >> This patch adds support to query the SGX capability from the qemu.
> >>
> >> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> >> ---
> >>  src/conf/domain_capabilities.c                |  10 ++
> >>  src/conf/domain_capabilities.h                |  13 ++
> >>  src/libvirt_private.syms                      |   1 +
> >>  src/qemu/qemu_capabilities.c                  | 119 ++++++++++++++++++
> >>  src/qemu/qemu_capabilities.h                  |   6 +
> >>  src/qemu/qemu_capspriv.h                      |   4 +
> >>  src/qemu/qemu_monitor.c                       |  10 ++
> >>  src/qemu/qemu_monitor.h                       |   3 +
> >>  src/qemu/qemu_monitor_json.c                  | 104 +++++++++++++--
> >>  src/qemu/qemu_monitor_json.h                  |   9 ++
> >>  .../caps_6.2.0.x86_64.replies                 |  22 +++-
> >>  .../caps_6.2.0.x86_64.xml                     |   5 +
> >>  .../caps_7.0.0.x86_64.replies                 |  22 +++-
> >>  .../caps_7.0.0.x86_64.xml                     |   5 +
> >>  14 files changed, 318 insertions(+), 15 deletions(-)
> > 
> > This is not a full review. Couple of points:
> > 
> > 1) Do not mix other changes with adding QEMU_CAPS* stuff
> >     Basically theres waaay too much going on in this patch and it
> >     definitely can be separated into smaller chunks. The QEMU_CAPS is
> >     just one of them.
> >     Separate at least:
> >         - qemu monitor command introduction
> >         - domain capabilities data structs for sgx
> >         - parsing and formatting of the XML
> >         - adding of the QEMU_CAPS_ flag
> > 2) caps for qemu-7.1 were added very recently
> >     You'll need to fix that one too since you added an extra query. Make
> >     sure that you _don't_ add the faking of SXG into that file, but
> >     rather the error case. My box doesn't support SGX so it will be
> >     overwritten in my next refresh anyways.
> > 
> > [...]
> > 
> >> @@ -4706,6 +4805,21 @@ virQEMUCapsFormatSEVInfo(virQEMUCaps *qemuCaps, virBuffer *buf)
> >>  }
> >>  
> >>  
> >> +static void
> >> +virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
> >> +                         virBuffer *buf)
> >> +{
> >> +    virSGXCapabilityPtr sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
> >> +
> >> +    virBufferAddLit(buf, "<sgx>\n");
> >> +    virBufferAdjustIndent(buf, 2);
> >> +    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
> > 
> > Don't use the ternary operator ('?'), use a full if/else branch instead
> > or pick a better data structure.
> 
> I wish our coding style was more forgiving about ternary operator.
> Because in this specific case we have bad and worse options:
> 
> 1) Expand to if-else fully:
> 
>   if (boolVar)
>     virBufferAddLit(buf, "<elem>yes</elem>\n");
>   else
>     virBufferAddLit(buf, "<elem>no</elem>\n");
> 
> 2) use virTristateBoolFromBool()
> 
>   virBufferAsprintf(buf, "<elem>%s</elem>\n",
> virTristateBoolTypeToString(virTristateBoolFromBool(boolVar)));
> 
> 3) use a temporary variable:
> 
>    char *tmp;
>    if (boolVar)
>      tmp = "yes";
>    else
>      tmp = "no";
> 
>   virBufferAsprintf(buf, "<elem>%s</elem>\n", tmp);
> 
> 4) use virTristateBool:
> 
>   if (virTristateVar)
>     virBudderAsprintf(buf, "<elem>%s</elem>\n",
> virTristateBoolTypeToSring(virTristateVar));
> 
> 5) Introduce a helper, e.g.
> 
> const char *
> virYesNoString(bool val) {
>   if (val)
>     return "yes";
>   return "no";
> }
> 
>   virBufferAsprintf(buf, "<elem>%s</elem>\n", virYesNoString(boolVar));
> 
> Frankly speaking, I dislike 2) the most, followed by 1, 3, 4, 5.
> According to my understanding, we discourage use of ternary operator
> because it can lead to hard to parse expressions. But one can hardly
> argue about bool ? "yes" : "no" being hard to parse.

We use the ternary operator all over the code for this exact pattern
and it is just fine. As you say all these other options above are
worse than what this patch has.  The style guide needs changing to
make this usage clearly acceptable.


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From pkrempa at redhat.com  Mon Jul 25 12:45:18 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 14:45:18 +0200
Subject: [PATCH 1/5] qemuMigrationDstFinishFresh: Avoid multi-line ternary
 operator in function call
In-Reply-To: <cover.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
Message-ID: <f96c695d88798720fec8c7c0e84148f9c0bbd0ac.1658753062.git.pkrempa@redhat.com>

Rewrite the code using a temporary variable.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 20dc91f1ce..800f66349d 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -6601,9 +6601,14 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
         *inPostCopy = true;

     if (!(flags & VIR_MIGRATE_PAUSED)) {
-        if (qemuProcessStartCPUs(driver, vm,
-                                 *inPostCopy ? VIR_DOMAIN_RUNNING_POSTCOPY
-                                             : VIR_DOMAIN_RUNNING_MIGRATED,
+        virDomainRunningReason runningReason;
+
+        if (inPostCopy)
+            runningReason = VIR_DOMAIN_RUNNING_POSTCOPY;
+        else
+            runningReason = VIR_DOMAIN_RUNNING_MIGRATED;
+
+        if (qemuProcessStartCPUs(driver, vm, runningReason,
                                  VIR_ASYNC_JOB_MIGRATION_IN) < 0) {
             if (virGetLastErrorCode() == VIR_ERR_OK)
                 virReportError(VIR_ERR_INTERNAL_ERROR,
-- 
2.36.1


From pkrempa at redhat.com  Mon Jul 25 12:45:19 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 14:45:19 +0200
Subject: [PATCH 2/5] qemuMigrationDstPersist: Avoid multi-line ternary
 operator in function call
In-Reply-To: <cover.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
Message-ID: <0f7bcdeed7bcbec45f499d65c99004994997ea03.1658753062.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 800f66349d..a14b774a22 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -6393,6 +6393,7 @@ qemuMigrationDstPersist(virQEMUDriver *driver,
     g_autoptr(virDomainDef) oldDef = NULL;
     unsigned int oldPersist = vm->persistent;
     virObjectEvent *event;
+    virDomainEventDefinedDetailType eventDetail = VIR_DOMAIN_EVENT_DEFINED_UPDATED;

     vm->persistent = 1;
     oldDef = vm->newDef;
@@ -6402,18 +6403,19 @@ qemuMigrationDstPersist(virQEMUDriver *driver,
                                                priv->qemuCaps)))
         goto error;

-    if (!oldPersist && qemuDomainNamePathsCleanup(cfg, vmdef->name, false) < 0)
-        goto error;
+    if (!oldPersist) {
+        eventDetail = VIR_DOMAIN_EVENT_DEFINED_ADDED;
+
+        if (qemuDomainNamePathsCleanup(cfg, vmdef->name, false) < 0)
+            goto error;
+    }

     if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0 &&
         !ignoreSaveError)
         goto error;

-    event = virDomainEventLifecycleNewFromObj(vm,
-                                              VIR_DOMAIN_EVENT_DEFINED,
-                                              oldPersist ?
-                                              VIR_DOMAIN_EVENT_DEFINED_UPDATED :
-                                              VIR_DOMAIN_EVENT_DEFINED_ADDED);
+    event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED,
+                                              eventDetail);
     virObjectEventStateQueue(driver->domainEventState, event);

     return 0;
-- 
2.36.1


From pkrempa at redhat.com  Mon Jul 25 12:45:17 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 14:45:17 +0200
Subject: [PATCH 0/5] qemu: Migration code (ternary operator) cleanups
Message-ID: <cover.1658753062.git.pkrempa@redhat.com>

I've noticed few things that could be improved during review of Jirka's
post copy migration changes but didn't want to interfer with the series
at that point.

Peter Krempa (5):
  qemuMigrationDstFinishFresh: Avoid multi-line ternary operator in
    function call
  qemuMigrationDstPersist: Avoid multi-line ternary operator in function
    call
  qemu: migration: Overwrite 'dname' only when NULL
  qemuMigrationSrcIOFunc: Avoid unnecessary string construction
  qemu: monitor: Split up enum strings definitions

 src/qemu/qemu_migration.c | 37 +++++++++++++++++++++++--------------
 src/qemu/qemu_monitor.c   | 35 ++++++++++++++++++++++++++---------
 2 files changed, 49 insertions(+), 23 deletions(-)

-- 
2.36.1


From pkrempa at redhat.com  Mon Jul 25 12:45:20 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 14:45:20 +0200
Subject: [PATCH 3/5] qemu: migration: Overwrite 'dname' only when NULL
In-Reply-To: <cover.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
Message-ID: <afbbf87c72492effe148f910b90271f40d6fd41c.1658753062.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index a14b774a22..0d696e1d46 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5422,7 +5422,8 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver,
      * status code from the sender to the destination host,
      * so it can do any cleanup if the migration failed.
      */
-    dname = dname ? dname : vm->def->name;
+    if (!dname)
+        dname = vm->def->name;
     VIR_DEBUG("Finish2 %p ret=%d", dconn, ret);
     qemuDomainObjEnterRemote(vm);
     ddomain = dconn->driver->domainMigrateFinish2
@@ -5707,7 +5708,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
                 goto cleanup;
         }
     } else {
-        dname = dname ? dname : vm->def->name;
+        if (!dname)
+            dname = vm->def->name;
         qemuDomainObjEnterRemote(vm);
         ddomain = dconn->driver->domainMigrateFinish3
             (dconn, dname, cookiein, cookieinlen, &cookieout, &cookieoutlen,
-- 
2.36.1


From pkrempa at redhat.com  Mon Jul 25 12:45:21 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 14:45:21 +0200
Subject: [PATCH 4/5] qemuMigrationSrcIOFunc: Avoid unnecessary string
 construction
In-Reply-To: <cover.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
Message-ID: <f162fead41a3d1a6451104c9864634981d5c769d.1658753062.git.pkrempa@redhat.com>

Use full strings for better greppability.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 0d696e1d46..f2ccbe11b9 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4267,11 +4267,11 @@ static void qemuMigrationSrcIOFunc(void *arg)
                 goto abrt;
             }

-            VIR_DEBUG("Migration tunnel was asked to %s",
-                      stop ? "abort" : "finish");
             if (stop) {
+                VIR_DEBUG("Migration tunnel was asked to stop");
                 goto abrt;
             } else {
+                VIR_DEBUG("Migration tunnel was asked to finish");
                 timeout = 0;
             }
         }
-- 
2.36.1


From pkrempa at redhat.com  Mon Jul 25 12:45:22 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 14:45:22 +0200
Subject: [PATCH 5/5] qemu: monitor: Split up enum strings definitions
In-Reply-To: <cover.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
Message-ID: <1b7dd555829ff787224f34f1a5096a0c6b8beb01.1658753062.git.pkrempa@redhat.com>

The VIR_ENUM_IMPL macros directly above them list one string per line.
Use the same also for qemuMonitorMigrationStatus and
qemuMonitorVMStatus.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 9687746703..6ebdeb46f3 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -144,20 +144,37 @@ VIR_ENUM_IMPL(qemuMonitorCPUProperty,

 VIR_ENUM_IMPL(qemuMonitorMigrationStatus,
               QEMU_MONITOR_MIGRATION_STATUS_LAST,
-              "inactive", "setup",
-              "active", "pre-switchover",
-              "device", "postcopy-active",
-              "postcopy-paused", "postcopy-recover",
-              "completed", "failed",
-              "cancelling", "cancelled",
+              "inactive",
+              "setup",
+              "active",
+              "pre-switchover",
+              "device",
+              "postcopy-active",
+              "postcopy-paused",
+              "postcopy-recover",
+              "completed",
+              "failed",
+              "cancelling",
+              "cancelled",
               "wait-unplug",
 );

 VIR_ENUM_IMPL(qemuMonitorVMStatus,
               QEMU_MONITOR_VM_STATUS_LAST,
-              "debug", "inmigrate", "internal-error", "io-error", "paused",
-              "postmigrate", "prelaunch", "finish-migrate", "restore-vm",
-              "running", "save-vm", "shutdown", "watchdog", "guest-panicked",
+              "debug",
+              "inmigrate",
+              "internal-error",
+              "io-error",
+              "paused",
+              "postmigrate",
+              "prelaunch",
+              "finish-migrate",
+              "restore-vm",
+              "running",
+              "save-vm",
+              "shutdown",
+              "watchdog",
+              "guest-panicked",
 );

 typedef enum {
-- 
2.36.1


From rjones at redhat.com  Mon Jul 25 13:09:39 2022
From: rjones at redhat.com (Richard W.M. Jones)
Date: Mon, 25 Jul 2022 14:09:39 +0100
Subject: [PATCH] rpc: Pass OPENSSL_CONF through to ssh invocations
Message-ID: <20220725130939.1200674-1-rjones@redhat.com>

It's no longer possible for libvirt to connect over the ssh transport
from RHEL 9 to RHEL 5.  This is because SHA1 signatures have been
effectively banned in RHEL 9 at the openssl level.  They are required
to check the RHEL 5 host key.  Note this is a separate issue from
openssh requiring additional configuration in order to connect to
older servers.

Connecting from a RHEL 9 client to RHEL 5 server:

$ cat ~/.ssh/config
Host 192.168.0.91
  KexAlgorithms            +diffie-hellman-group14-sha1
  MACs                     +hmac-sha1
  HostKeyAlgorithms        +ssh-rsa
  PubkeyAcceptedKeyTypes   +ssh-rsa
  PubkeyAcceptedAlgorithms +ssh-rsa

$ virsh -c 'qemu+ssh://root at 192.168.0.91/system' list
error: failed to connect to the hypervisor
error: Cannot recv data: ssh_dispatch_run_fatal: Connection to 192.168.0.91 port 22: error in libcrypto: Connection reset by peer

"error in libcrypto: Connection reset by peer" is the characteristic
error of openssl having been modified to disable SHA1 by default.
(You will not see this on non-RHEL-derived distros.)

You could enable the legacy crypto policy which downgrades security on
the entire host, but a more fine-grained way to do this is to create
an alternate openssl configuration file that enables the "forbidden"
signatures.  However this requires passing the OPENSSL_CONF
environment variable through to ssh to specify the alternate
configuration.  Libvirt filters out this environment variable, but
this commit allows it through.  With this commit:

$ cat /var/tmp/openssl.cnf
.include /etc/ssl/openssl.cnf
[openssl_init]
alg_section = evp_properties
[evp_properties]
rh-allow-sha1-signatures = yes

$ OPENSSL_CONF=/var/tmp/openssl.cnf ./run virsh -c 'qemu+ssh://root at 192.168.0.91/system' list
root at 192.168.0.91's password:
 Id   Name   State
--------------------

Essentially my argument here is that OPENSSL_CONF is sufficiently
similar in nature to KRB5CCNAME, SSH* and XAUTHORITY that we should
permit it to be passed through.

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360
Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
---
 src/rpc/virnetsocket.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 32f506d2d4..8280bda007 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -855,6 +855,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
     virCommandAddEnvPass(cmd, "KRB5CCNAME");
     virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
     virCommandAddEnvPass(cmd, "SSH_ASKPASS");
+    virCommandAddEnvPass(cmd, "OPENSSL_CONF");
     virCommandAddEnvPass(cmd, "DISPLAY");
     virCommandAddEnvPass(cmd, "XAUTHORITY");
     virCommandClearCaps(cmd);
-- 
2.31.1


From mprivozn at redhat.com  Mon Jul 25 13:13:58 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 25 Jul 2022 15:13:58 +0200
Subject: [PATCH] coding-style: Allow some use of ternary operators
Message-ID: <74d640cf2d9b76203b20e42acbbab9ba6fd87477.1658754838.git.mprivozn@redhat.com>

While we all understand that excessive use of ternary operator
may worsen code readability (e.g. nested, multi-line expression),
there are few cases where using it actually improves code
readability. For instance, when a function takes a long list of
arguments out of which one depends on a boolean expression, or
when formatting "yes"/"no" or "on"/"off" values based on a
boolean variable (although one can argue that the latter is a
subset of the former). Just consider alternatives to:

  virBufferAsprintf(buf, "<elem>%s</elem>\n", boolVar ? "yes" : "no");

In fact, this pattern occurs plenty in our code. Exempt if from
our "no ternary operators" rule.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/coding-style.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/coding-style.rst b/docs/coding-style.rst
index bf0a80fbc5..038f18bda2 100644
--- a/docs/coding-style.rst
+++ b/docs/coding-style.rst
@@ -470,7 +470,9 @@ Pointer comparisons may be shortened. All long forms are okay.
     if (!foo)                # or: if (foo == NULL)
 
 New code should avoid the ternary operator as much as possible.
-Specifically it must never span more than one line or nest:
+Specifically it must never span more than one line or nest. However,
+its usage in very basic cases is warranted (e.g. when deciding
+between two constant strings):
 
 ::
 
@@ -481,6 +483,9 @@ Specifically it must never span more than one line or nest:
 
     char *foo = bar ? bar->baz ? bar->baz->foo : "nobaz" : "nobar";
 
+  GOOD:
+    virBufferAsprintf(buf, "<element>%s</element>\n", boolVar ? "yes" : "no");
+
 Preprocessor
 ------------
 
-- 
2.35.1


From cfontana at suse.de  Mon Jul 25 13:30:38 2022
From: cfontana at suse.de (Claudio Fontana)
Date: Mon, 25 Jul 2022 15:30:38 +0200
Subject: [PATCH] coding-style: Allow some use of ternary operators
In-Reply-To: <74d640cf2d9b76203b20e42acbbab9ba6fd87477.1658754838.git.mprivozn@redhat.com>
References: <74d640cf2d9b76203b20e42acbbab9ba6fd87477.1658754838.git.mprivozn@redhat.com>
Message-ID: <ad6b9972-e2d5-7f7e-998d-460acde52476@suse.de>

A common sense improvement.

Reviewed-by: Claudio Fontana <cfontana at suse.de>

On 7/25/22 15:13, Michal Privoznik wrote:
> While we all understand that excessive use of ternary operator
> may worsen code readability (e.g. nested, multi-line expression),
> there are few cases where using it actually improves code
> readability. For instance, when a function takes a long list of
> arguments out of which one depends on a boolean expression, or
> when formatting "yes"/"no" or "on"/"off" values based on a
> boolean variable (although one can argue that the latter is a
> subset of the former). Just consider alternatives to:
> 
>   virBufferAsprintf(buf, "<elem>%s</elem>\n", boolVar ? "yes" : "no");
> 
> In fact, this pattern occurs plenty in our code. Exempt if from
> our "no ternary operators" rule.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  docs/coding-style.rst | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/coding-style.rst b/docs/coding-style.rst
> index bf0a80fbc5..038f18bda2 100644
> --- a/docs/coding-style.rst
> +++ b/docs/coding-style.rst
> @@ -470,7 +470,9 @@ Pointer comparisons may be shortened. All long forms are okay.
>      if (!foo)                # or: if (foo == NULL)
>  
>  New code should avoid the ternary operator as much as possible.
> -Specifically it must never span more than one line or nest:
> +Specifically it must never span more than one line or nest. However,
> +its usage in very basic cases is warranted (e.g. when deciding
> +between two constant strings):
>  
>  ::
>  
> @@ -481,6 +483,9 @@ Specifically it must never span more than one line or nest:
>  
>      char *foo = bar ? bar->baz ? bar->baz->foo : "nobaz" : "nobar";
>  
> +  GOOD:
> +    virBufferAsprintf(buf, "<element>%s</element>\n", boolVar ? "yes" : "no");
> +
>  Preprocessor
>  ------------
>  


From lersek at redhat.com  Mon Jul 25 13:38:33 2022
From: lersek at redhat.com (Laszlo Ersek)
Date: Mon, 25 Jul 2022 15:38:33 +0200
Subject: [PATCH] rpc: Pass OPENSSL_CONF through to ssh invocations
In-Reply-To: <20220725130939.1200674-1-rjones@redhat.com>
References: <20220725130939.1200674-1-rjones@redhat.com>
Message-ID: <09b23744-ae83-aa6f-0182-a93ddb3b3620@redhat.com>

On 07/25/22 15:09, Richard W.M. Jones wrote:
> It's no longer possible for libvirt to connect over the ssh transport
> from RHEL 9 to RHEL 5.  This is because SHA1 signatures have been
> effectively banned in RHEL 9 at the openssl level.  They are required
> to check the RHEL 5 host key.  Note this is a separate issue from
> openssh requiring additional configuration in order to connect to
> older servers.
> 
> Connecting from a RHEL 9 client to RHEL 5 server:
> 
> $ cat ~/.ssh/config
> Host 192.168.0.91
>   KexAlgorithms            +diffie-hellman-group14-sha1
>   MACs                     +hmac-sha1
>   HostKeyAlgorithms        +ssh-rsa
>   PubkeyAcceptedKeyTypes   +ssh-rsa
>   PubkeyAcceptedAlgorithms +ssh-rsa
> 
> $ virsh -c 'qemu+ssh://root at 192.168.0.91/system' list
> error: failed to connect to the hypervisor
> error: Cannot recv data: ssh_dispatch_run_fatal: Connection to 192.168.0.91 port 22: error in libcrypto: Connection reset by peer
> 
> "error in libcrypto: Connection reset by peer" is the characteristic
> error of openssl having been modified to disable SHA1 by default.
> (You will not see this on non-RHEL-derived distros.)
> 
> You could enable the legacy crypto policy which downgrades security on
> the entire host, but a more fine-grained way to do this is to create
> an alternate openssl configuration file that enables the "forbidden"
> signatures.  However this requires passing the OPENSSL_CONF
> environment variable through to ssh to specify the alternate
> configuration.  Libvirt filters out this environment variable, but
> this commit allows it through.  With this commit:
> 
> $ cat /var/tmp/openssl.cnf
> .include /etc/ssl/openssl.cnf
> [openssl_init]
> alg_section = evp_properties
> [evp_properties]
> rh-allow-sha1-signatures = yes
> 
> $ OPENSSL_CONF=/var/tmp/openssl.cnf ./run virsh -c 'qemu+ssh://root at 192.168.0.91/system' list
> root at 192.168.0.91's password:
>  Id   Name   State
> --------------------
> 
> Essentially my argument here is that OPENSSL_CONF is sufficiently
> similar in nature to KRB5CCNAME, SSH* and XAUTHORITY that we should
> permit it to be passed through.
> 
> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360
> Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
> ---
>  src/rpc/virnetsocket.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
> index 32f506d2d4..8280bda007 100644
> --- a/src/rpc/virnetsocket.c
> +++ b/src/rpc/virnetsocket.c
> @@ -855,6 +855,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
>      virCommandAddEnvPass(cmd, "KRB5CCNAME");
>      virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
>      virCommandAddEnvPass(cmd, "SSH_ASKPASS");
> +    virCommandAddEnvPass(cmd, "OPENSSL_CONF");
>      virCommandAddEnvPass(cmd, "DISPLAY");
>      virCommandAddEnvPass(cmd, "XAUTHORITY");
>      virCommandClearCaps(cmd);
> 

Acked-by: Laszlo Ersek <lersek at redhat.com>

From mprivozn at redhat.com  Mon Jul 25 13:40:41 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 15:40:41 +0200
Subject: [libvirt PATCH 0/2] qemu: support stateless UEFI firmware
In-Reply-To: <20220722162317.2377173-1-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
Message-ID: <e31be809-a07a-e9e8-174c-7ffcd27bbe07@redhat.com>

On 7/22/22 18:23, Daniel P. Berrang? wrote:
> This is to enable SEV builds of UEFI which provide only a single CODE.fd
> file, with not VARS.fd.
> 
> Daniel P. Berrang? (2):
>   conf: support stateless UEFI firmware
>   qemu: support use of stateless EFI firmware
> 
>  docs/formatdomain.rst                         |  9 +++-
>  src/conf/domain_conf.c                        |  9 ++++
>  src/conf/domain_conf.h                        |  1 +
>  src/conf/domain_validate.c                    | 26 ++++++++++
>  src/conf/schemas/domaincommon.rng             |  5 ++
>  src/qemu/qemu_domain.c                        |  3 +-
>  src/qemu/qemu_firmware.c                      | 48 +++++++++++--------
>  ...-auto-bios-not-stateless.x86_64-latest.err |  1 +
>  .../firmware-auto-bios-not-stateless.xml      | 18 +++++++
>  ...are-auto-bios-stateless.x86_64-latest.args | 32 +++++++++++++
>  .../firmware-auto-bios-stateless.xml          | 18 +++++++
>  ...ware-auto-efi-stateless.x86_64-latest.args | 33 +++++++++++++
>  .../firmware-auto-efi-stateless.xml           | 18 +++++++
>  .../firmware-manual-bios-not-stateless.err    |  1 +
>  .../firmware-manual-bios-not-stateless.xml    | 15 ++++++
>  .../firmware-manual-bios-stateless.args       | 30 ++++++++++++
>  .../firmware-manual-bios-stateless.xml        | 15 ++++++
>  ...nual-efi-nvram-stateless.x86_64-latest.err |  1 +
>  .../firmware-manual-efi-nvram-stateless.xml   | 21 ++++++++
>  ...nvram-template-stateless.x86_64-latest.err |  1 +
>  ...re-manual-efi-nvram-template-stateless.xml | 19 ++++++++
>  ...re-manual-efi-stateless.x86_64-latest.args | 33 +++++++++++++
>  .../firmware-manual-efi-stateless.xml         | 18 +++++++
>  tests/qemuxml2argvtest.c                      | 10 ++++
>  ...ware-auto-bios-stateless.x86_64-latest.xml | 34 +++++++++++++
>  .../firmware-manual-bios-stateless.xml        | 25 ++++++++++
>  .../firmware-manual-bios.xml                  | 25 ++++++++++
>  tests/qemuxml2xmltest.c                       |  3 ++
>  28 files changed, 451 insertions(+), 21 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
>  create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
>  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios.xml
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Mon Jul 25 13:40:45 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 15:40:45 +0200
Subject: [libvirt PATCH 1/2] conf: support stateless UEFI firmware
In-Reply-To: <20220722162317.2377173-2-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
 <20220722162317.2377173-2-berrange@redhat.com>
Message-ID: <51254778-51ff-c5af-7fc3-5f544e553a93@redhat.com>

On 7/22/22 18:23, Daniel P. Berrang? wrote:
> Normally when an UEFI firmware is marked as read-only, an associated
> NVRAM file will be created. Some builds of UEFI firmware, however, wish
> to remain stateless and so will be read-only, but never have any NVRAM
> file. To represent this concept a 'stateless' tristate bool attribute
> is introduced on the <loader/> element.
> 
> There are rather a large number of permutations to consider.
> 
> With default firmware selection
> 
>   *  <os/>
> 
>      => Historic default, no change
> 
>   *  <os>
>        <loader stateless='yes'/>
>      </os>
> 
>      => Explicit version of historic default, no change
> 
>   *  <os>
>        <loader stateless='no'/>
>      </os>
> 
>       => Invalid, bios is always stateless
> 
> With manual legacy BIOS selection
> 
>   *  <os>
>        <loader>/path/to/seabios</loader>
>        ...
>      </os>
> 
>      => Historic default, no change
> 
>   *  <os>
>        <loader stateless='yes'>/path/to/seabios</loader>
>        ...
>      </os>
> 
>      => Explicit version of historic default, no change
> 
>   *  <os>
>        <loader stateless='no'>/path/to/seabios</loader>
>        ...
>      </os>
> 
>       => Invalid, bios is always stateless
> 
> With manual UEFI selection
> 
>   *  <os>
>        <loader type='pflash'>/path/to/edk2</loader>
>        ...
>      </os>
> 
>      => Historic default, no change
> 
>   *  <os>
>        <loader type='pflash' stateless='yes'>/path/to/edk2</loader>
>        ...
>      </os>
> 
>      => Skip auto-filling NVRAM / template
> 
>   *  <os>
>        <loader type='pflash' stateless='no'>/path/to/edk2</loader>
>        ...
>      </os>
> 
>      => Explicit version of historic default, no change
> 
> With automatic firmware selection
> 
>   *  <os firmware='bios'/>
> 
>      => Historic default, no change
> 
>   *  <os firmware='bios'>
>        <loader stateless='yes'/>
>      </os>
> 
>      => Explicit version of historic default, no change
> 
>   *  <os firmware='bios'>
>        <loader stateless='no'/>
>      </os>
> 
>       => Invalid, bios is always stateless
> 
>   *  <os firmware='uefi'/>
> 
>      => Historic default, no change
> 
>   *  <os firmware='uefi'>
>        <loader stateless='yes'/>
>      </os>
> 
>      => Skip auto-filling NVRAM / template
> 
>   *  <os firmware='uefi'>
>        <loader stateless='no'/>
>      </os>
> 
>      => Explicit version of historic default, no change
> 
> Signed-off-by: Daniel P. Berrang? <berrange at redhat.com>
> ---
>  docs/formatdomain.rst                         |  9 ++++-
>  src/conf/domain_conf.c                        |  9 +++++
>  src/conf/domain_conf.h                        |  1 +
>  src/conf/domain_validate.c                    | 26 ++++++++++++++
>  src/conf/schemas/domaincommon.rng             |  5 +++
>  ...-auto-bios-not-stateless.x86_64-latest.err |  1 +
>  .../firmware-auto-bios-not-stateless.xml      | 18 ++++++++++
>  ...are-auto-bios-stateless.x86_64-latest.args | 32 +++++++++++++++++
>  .../firmware-auto-bios-stateless.xml          | 18 ++++++++++
>  .../firmware-manual-bios-not-stateless.err    |  1 +
>  .../firmware-manual-bios-not-stateless.xml    | 15 ++++++++
>  .../firmware-manual-bios-stateless.args       | 30 ++++++++++++++++
>  .../firmware-manual-bios-stateless.xml        | 15 ++++++++
>  ...nual-efi-nvram-stateless.x86_64-latest.err |  1 +
>  .../firmware-manual-efi-nvram-stateless.xml   | 21 ++++++++++++
>  ...nvram-template-stateless.x86_64-latest.err |  1 +
>  ...re-manual-efi-nvram-template-stateless.xml | 19 +++++++++++
>  tests/qemuxml2argvtest.c                      |  8 +++++
>  ...ware-auto-bios-stateless.x86_64-latest.xml | 34 +++++++++++++++++++
>  .../firmware-manual-bios-stateless.xml        | 25 ++++++++++++++
>  .../firmware-manual-bios.xml                  | 25 ++++++++++++++
>  tests/qemuxml2xmltest.c                       |  3 ++
>  22 files changed, 316 insertions(+), 1 deletion(-)
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
>  create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
>  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
>  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios.xml
> 
> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
> index 3ea094e64c..4199abfd1a 100644
> --- a/docs/formatdomain.rst
> +++ b/docs/formatdomain.rst
> @@ -242,7 +242,11 @@ harddisk, cdrom, network) determining where to obtain/find the boot image.
>     firmwares may implement the Secure boot feature. Attribute ``secure`` can be
>     used to tell the hypervisor that the firmware is capable of Secure Boot feature.
>     It cannot be used to enable or disable the feature itself in the firmware.
> -   :since:`Since 2.1.0`
> +   :since:`Since 2.1.0`. If the loader is marked as read-only, then with UEFI it
> +   is assumed that there will be a writable NVRAM available. In some cases,
> +   however, it may be desirable for the loader to run without any NVRAM, discarding
> +   any config changes on shutdown. The ``stateless`` flag can be used to control
> +   this behaviour, when set to ``no`` NVRAM will never be created.

The ``stateless` flag (:since:since 8.6.0) can be used ...
Or something among those lines, to make it obvious when the attribute
was added.

>  ``nvram``
>     Some UEFI firmwares may want to use a non-volatile memory to store some
>     variables. In the host, this is represented as a file and the absolute path

Michal


From mprivozn at redhat.com  Mon Jul 25 13:51:29 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 15:51:29 +0200
Subject: [PATCH 0/5] qemu: Migration code (ternary operator) cleanups
In-Reply-To: <cover.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
Message-ID: <4d359b3b-2a19-dc62-04e2-cf844c9cc7cd@redhat.com>

On 7/25/22 14:45, Peter Krempa wrote:
> I've noticed few things that could be improved during review of Jirka's
> post copy migration changes but didn't want to interfer with the series
> at that point.
> 
> Peter Krempa (5):
>   qemuMigrationDstFinishFresh: Avoid multi-line ternary operator in
>     function call
>   qemuMigrationDstPersist: Avoid multi-line ternary operator in function
>     call
>   qemu: migration: Overwrite 'dname' only when NULL
>   qemuMigrationSrcIOFunc: Avoid unnecessary string construction
>   qemu: monitor: Split up enum strings definitions
> 
>  src/qemu/qemu_migration.c | 37 +++++++++++++++++++++++--------------
>  src/qemu/qemu_monitor.c   | 35 ++++++++++++++++++++++++++---------
>  2 files changed, 49 insertions(+), 23 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

But see my comment to 1/5 before pushing. There's one typo that needs
fixing.

Michal


From mprivozn at redhat.com  Mon Jul 25 13:51:28 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 15:51:28 +0200
Subject: [PATCH 1/5] qemuMigrationDstFinishFresh: Avoid multi-line ternary
 operator in function call
In-Reply-To: <f96c695d88798720fec8c7c0e84148f9c0bbd0ac.1658753062.git.pkrempa@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
 <f96c695d88798720fec8c7c0e84148f9c0bbd0ac.1658753062.git.pkrempa@redhat.com>
Message-ID: <a5e5e5e4-466f-dfe9-0f42-e331634ae594@redhat.com>

On 7/25/22 14:45, Peter Krempa wrote:
> Rewrite the code using a temporary variable.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 20dc91f1ce..800f66349d 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -6601,9 +6601,14 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
>          *inPostCopy = true;
> 
>      if (!(flags & VIR_MIGRATE_PAUSED)) {
> -        if (qemuProcessStartCPUs(driver, vm,
> -                                 *inPostCopy ? VIR_DOMAIN_RUNNING_POSTCOPY
> -                                             : VIR_DOMAIN_RUNNING_MIGRATED,
> +        virDomainRunningReason runningReason;
> +
> +        if (inPostCopy)

This needs to dereference the variable, just like the original did.

And what is your opinion on initializing the newly introduced variable
to _MIGRATED and then having this if() to overwrite it to _POSTCOPY?

virDomainRunningReason runningReason = VIR_DOMAIN_RUNNING_MIGRATED;

if (*inPostCopy)
  runningReason = VIR_DOMAIN_RUNNING_POSTCOPY;


Michal


From mprivozn at redhat.com  Mon Jul 25 13:56:22 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 15:56:22 +0200
Subject: [PATCH] rpc: Pass OPENSSL_CONF through to ssh invocations
In-Reply-To: <09b23744-ae83-aa6f-0182-a93ddb3b3620@redhat.com>
References: <20220725130939.1200674-1-rjones@redhat.com>
 <09b23744-ae83-aa6f-0182-a93ddb3b3620@redhat.com>
Message-ID: <d2e5b710-b44d-05b0-95ec-65f41ccb0b91@redhat.com>

On 7/25/22 15:38, Laszlo Ersek wrote:
> On 07/25/22 15:09, Richard W.M. Jones wrote:
>> It's no longer possible for libvirt to connect over the ssh transport
>> from RHEL 9 to RHEL 5.  This is because SHA1 signatures have been
>> effectively banned in RHEL 9 at the openssl level.  They are required
>> to check the RHEL 5 host key.  Note this is a separate issue from
>> openssh requiring additional configuration in order to connect to
>> older servers.
>>
>> Connecting from a RHEL 9 client to RHEL 5 server:
>>
>> $ cat ~/.ssh/config
>> Host 192.168.0.91
>>   KexAlgorithms            +diffie-hellman-group14-sha1
>>   MACs                     +hmac-sha1
>>   HostKeyAlgorithms        +ssh-rsa
>>   PubkeyAcceptedKeyTypes   +ssh-rsa
>>   PubkeyAcceptedAlgorithms +ssh-rsa
>>
>> $ virsh -c 'qemu+ssh://root at 192.168.0.91/system' list
>> error: failed to connect to the hypervisor
>> error: Cannot recv data: ssh_dispatch_run_fatal: Connection to 192.168.0.91 port 22: error in libcrypto: Connection reset by peer
>>
>> "error in libcrypto: Connection reset by peer" is the characteristic
>> error of openssl having been modified to disable SHA1 by default.
>> (You will not see this on non-RHEL-derived distros.)
>>
>> You could enable the legacy crypto policy which downgrades security on
>> the entire host, but a more fine-grained way to do this is to create
>> an alternate openssl configuration file that enables the "forbidden"
>> signatures.  However this requires passing the OPENSSL_CONF
>> environment variable through to ssh to specify the alternate
>> configuration.  Libvirt filters out this environment variable, but
>> this commit allows it through.  With this commit:
>>
>> $ cat /var/tmp/openssl.cnf
>> .include /etc/ssl/openssl.cnf
>> [openssl_init]
>> alg_section = evp_properties
>> [evp_properties]
>> rh-allow-sha1-signatures = yes
>>
>> $ OPENSSL_CONF=/var/tmp/openssl.cnf ./run virsh -c 'qemu+ssh://root at 192.168.0.91/system' list
>> root at 192.168.0.91's password:
>>  Id   Name   State
>> --------------------
>>
>> Essentially my argument here is that OPENSSL_CONF is sufficiently
>> similar in nature to KRB5CCNAME, SSH* and XAUTHORITY that we should
>> permit it to be passed through.
>>
>> Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2062360
>> Signed-off-by: Richard W.M. Jones <rjones at redhat.com>
>> ---
>>  src/rpc/virnetsocket.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
>> index 32f506d2d4..8280bda007 100644
>> --- a/src/rpc/virnetsocket.c
>> +++ b/src/rpc/virnetsocket.c
>> @@ -855,6 +855,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
>>      virCommandAddEnvPass(cmd, "KRB5CCNAME");
>>      virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
>>      virCommandAddEnvPass(cmd, "SSH_ASKPASS");
>> +    virCommandAddEnvPass(cmd, "OPENSSL_CONF");
>>      virCommandAddEnvPass(cmd, "DISPLAY");
>>      virCommandAddEnvPass(cmd, "XAUTHORITY");
>>      virCommandClearCaps(cmd);
>>
> 
> Acked-by: Laszlo Ersek <lersek at redhat.com>
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

and merged.

Michal


From berrange at redhat.com  Mon Jul 25 14:09:39 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 25 Jul 2022 15:09:39 +0100
Subject: [PATCH] coding-style: Allow some use of ternary operators
In-Reply-To: <74d640cf2d9b76203b20e42acbbab9ba6fd87477.1658754838.git.mprivozn@redhat.com>
References: <74d640cf2d9b76203b20e42acbbab9ba6fd87477.1658754838.git.mprivozn@redhat.com>
Message-ID: <Yt6kI1wwMGL71scC@redhat.com>

On Mon, Jul 25, 2022 at 03:13:58PM +0200, Michal Privoznik wrote:
> While we all understand that excessive use of ternary operator
> may worsen code readability (e.g. nested, multi-line expression),
> there are few cases where using it actually improves code
> readability. For instance, when a function takes a long list of
> arguments out of which one depends on a boolean expression, or
> when formatting "yes"/"no" or "on"/"off" values based on a
> boolean variable (although one can argue that the latter is a
> subset of the former). Just consider alternatives to:
> 
>   virBufferAsprintf(buf, "<elem>%s</elem>\n", boolVar ? "yes" : "no");
> 
> In fact, this pattern occurs plenty in our code. Exempt if from

s/if/it/

> our "no ternary operators" rule.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  docs/coding-style.rst | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/coding-style.rst b/docs/coding-style.rst
> index bf0a80fbc5..038f18bda2 100644
> --- a/docs/coding-style.rst
> +++ b/docs/coding-style.rst
> @@ -470,7 +470,9 @@ Pointer comparisons may be shortened. All long forms are okay.
>      if (!foo)                # or: if (foo == NULL)
>  
>  New code should avoid the ternary operator as much as possible.
> -Specifically it must never span more than one line or nest:
> +Specifically it must never span more than one line or nest. However,
> +its usage in very basic cases is warranted (e.g. when deciding
> +between two constant strings):

"However" shouldn't generally be the start of a sentence.

I'd suggest

  Its usage in basic cases is warranted (e.g. when deciding between
  two constant strings), however, it must never span more than one
  line or nest.

>  
>  ::
>  
> @@ -481,6 +483,9 @@ Specifically it must never span more than one line or nest:
>  
>      char *foo = bar ? bar->baz ? bar->baz->foo : "nobaz" : "nobar";
>  
> +  GOOD:
> +    virBufferAsprintf(buf, "<element>%s</element>\n", boolVar ? "yes" : "no");
> +
>  Preprocessor
>  ------------
>  
> -- 
> 2.35.1
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From pkrempa at redhat.com  Mon Jul 25 14:19:38 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 16:19:38 +0200
Subject: [PATCH 1/5] qemuMigrationDstFinishFresh: Avoid multi-line
 ternary operator in function call
In-Reply-To: <a5e5e5e4-466f-dfe9-0f42-e331634ae594@redhat.com>
References: <cover.1658753062.git.pkrempa@redhat.com>
 <f96c695d88798720fec8c7c0e84148f9c0bbd0ac.1658753062.git.pkrempa@redhat.com>
 <a5e5e5e4-466f-dfe9-0f42-e331634ae594@redhat.com>
Message-ID: <Yt6mevrBh+jN0EML@angien.pipo.sk>

On Mon, Jul 25, 2022 at 15:51:28 +0200, Michal Pr?vozn?k wrote:
> On 7/25/22 14:45, Peter Krempa wrote:
> > Rewrite the code using a temporary variable.
> > 
> > Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> > ---
> >  src/qemu/qemu_migration.c | 11 ++++++++---
> >  1 file changed, 8 insertions(+), 3 deletions(-)
> > 
> > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > index 20dc91f1ce..800f66349d 100644
> > --- a/src/qemu/qemu_migration.c
> > +++ b/src/qemu/qemu_migration.c
> > @@ -6601,9 +6601,14 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
> >          *inPostCopy = true;
> > 
> >      if (!(flags & VIR_MIGRATE_PAUSED)) {
> > -        if (qemuProcessStartCPUs(driver, vm,
> > -                                 *inPostCopy ? VIR_DOMAIN_RUNNING_POSTCOPY
> > -                                             : VIR_DOMAIN_RUNNING_MIGRATED,
> > +        virDomainRunningReason runningReason;
> > +
> > +        if (inPostCopy)
> 
> This needs to dereference the variable, just like the original did.

Oops, indeed.

> 
> And what is your opinion on initializing the newly introduced variable
> to _MIGRATED and then having this if() to overwrite it to _POSTCOPY?
> 
> virDomainRunningReason runningReason = VIR_DOMAIN_RUNNING_MIGRATED;
> 
> if (*inPostCopy)
>   runningReason = VIR_DOMAIN_RUNNING_POSTCOPY;

I actually had it like this at first, but decided to change it after
the same change in patch 2/5. I wanted to have both assignments close to
the usage place to make it obvious what the value is.

In this case the initialization assignment is close enough, though. 

From pkrempa at redhat.com  Mon Jul 25 14:21:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Mon, 25 Jul 2022 16:21:42 +0200
Subject: [PATCH 1/5] qemuMigrationDstFinishFresh: Avoid multi-line
 ternary operator in function call
In-Reply-To: <Yt6mevrBh+jN0EML@angien.pipo.sk>
References: <cover.1658753062.git.pkrempa@redhat.com>
 <f96c695d88798720fec8c7c0e84148f9c0bbd0ac.1658753062.git.pkrempa@redhat.com>
 <a5e5e5e4-466f-dfe9-0f42-e331634ae594@redhat.com>
 <Yt6mevrBh+jN0EML@angien.pipo.sk>
Message-ID: <Yt6m9uVg3ewn5bVl@angien.pipo.sk>

On Mon, Jul 25, 2022 at 16:19:38 +0200, Peter Krempa wrote:
> On Mon, Jul 25, 2022 at 15:51:28 +0200, Michal Pr?vozn?k wrote:
> > On 7/25/22 14:45, Peter Krempa wrote:
> > > Rewrite the code using a temporary variable.
> > > 
> > > Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> > > ---
> > >  src/qemu/qemu_migration.c | 11 ++++++++---
> > >  1 file changed, 8 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> > > index 20dc91f1ce..800f66349d 100644
> > > --- a/src/qemu/qemu_migration.c
> > > +++ b/src/qemu/qemu_migration.c
> > > @@ -6601,9 +6601,14 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
> > >          *inPostCopy = true;
> > > 
> > >      if (!(flags & VIR_MIGRATE_PAUSED)) {
> > > -        if (qemuProcessStartCPUs(driver, vm,
> > > -                                 *inPostCopy ? VIR_DOMAIN_RUNNING_POSTCOPY
> > > -                                             : VIR_DOMAIN_RUNNING_MIGRATED,
> > > +        virDomainRunningReason runningReason;
> > > +
> > > +        if (inPostCopy)
> > 
> > This needs to dereference the variable, just like the original did.
> 
> Oops, indeed.
> 
> > 
> > And what is your opinion on initializing the newly introduced variable
> > to _MIGRATED and then having this if() to overwrite it to _POSTCOPY?
> > 
> > virDomainRunningReason runningReason = VIR_DOMAIN_RUNNING_MIGRATED;
> > 
> > if (*inPostCopy)
> >   runningReason = VIR_DOMAIN_RUNNING_POSTCOPY;
> 
> I actually had it like this at first, but decided to change it after
> the same change in patch 2/5. I wanted to have both assignments close to
> the usage place to make it obvious what the value is.
> 
> In this case the initialization assignment is close enough, though. 

Looking at the patches again, I in fact forgot to do that change to 2/5,
so .... I'll just go with this suggestion :D

From mprivozn at redhat.com  Mon Jul 25 15:09:59 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Mon, 25 Jul 2022 17:09:59 +0200
Subject: [libvirt PATCH 0/3] qemu: Properly reset migration parameters on
 reconnect
In-Reply-To: <cover.1658502471.git.jdenemar@redhat.com>
References: <cover.1658502471.git.jdenemar@redhat.com>
Message-ID: <390689cc-4190-bde1-0be9-c864a188d191@redhat.com>

On 7/22/22 17:08, Jiri Denemark wrote:
> https://bugzilla.redhat.com/show_bug.cgi?id=2107892
> 
> Jiri Denemark (3):
>   qemu_migration: Store original migration params in status XML
>   qemu_migration_params: Refactor qemuMigrationParamsApply
>   qemu_migration_params: Refactor qemuMigrationParamsReset
> 
>  src/qemu/qemu_migration.c        |  6 +++
>  src/qemu/qemu_migration_params.c | 69 +++++++++++++++++++++++---------
>  2 files changed, 55 insertions(+), 20 deletions(-)
> 

Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Mon Jul 25 15:21:37 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Mon, 25 Jul 2022 17:21:37 +0200
Subject: [PATCH v2] coding-style: Allow some use of ternary operators
Message-ID: <d1a512f5bd72a0bfdf56ad49787d05626ace01a7.1658762451.git.mprivozn@redhat.com>

While we all understand that excessive use of ternary operator
may worsen code readability (e.g. nested, multi-line expression),
there are few cases where using it actually improves code
readability. For instance, when a function takes a long list of
arguments out of which one depends on a boolean expression, or
when formatting "yes"/"no" or "on"/"off" values based on a
boolean variable (although one can argue that the latter is a
subset of the former). Just consider alternatives to:

  virBufferAsprintf(buf, "<elem>%s</elem>\n", boolVar ? "yes" : "no");

In fact, this pattern occurs plenty in our code. Exempt it from
our "no ternary operators" rule.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
Reviewed-by: Claudio Fontana <cfontana at suse.de>
---

v2 of:

https://listman.redhat.com/archives/libvir-list/2022-July/233150.html

diff to v1:
- Changed wording, as suggested by Daniel.

 docs/coding-style.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/coding-style.rst b/docs/coding-style.rst
index bf0a80fbc5..81bd4474f1 100644
--- a/docs/coding-style.rst
+++ b/docs/coding-style.rst
@@ -470,7 +470,9 @@ Pointer comparisons may be shortened. All long forms are okay.
     if (!foo)                # or: if (foo == NULL)
 
 New code should avoid the ternary operator as much as possible.
-Specifically it must never span more than one line or nest:
+Its usage in basic cases is warranted (e.g. when deciding between
+two constant strings), however, it must never span more than one
+line or nest.
 
 ::
 
@@ -481,6 +483,9 @@ Specifically it must never span more than one line or nest:
 
     char *foo = bar ? bar->baz ? bar->baz->foo : "nobaz" : "nobar";
 
+  GOOD:
+    virBufferAsprintf(buf, "<element>%s</element>\n", boolVar ? "yes" : "no");
+
 Preprocessor
 ------------
 
-- 
2.35.1


From berrange at redhat.com  Mon Jul 25 15:40:45 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Mon, 25 Jul 2022 16:40:45 +0100
Subject: [PATCH v2] coding-style: Allow some use of ternary operators
In-Reply-To: <d1a512f5bd72a0bfdf56ad49787d05626ace01a7.1658762451.git.mprivozn@redhat.com>
References: <d1a512f5bd72a0bfdf56ad49787d05626ace01a7.1658762451.git.mprivozn@redhat.com>
Message-ID: <Yt65fRpMpLNBCoJ0@redhat.com>

On Mon, Jul 25, 2022 at 05:21:37PM +0200, Michal Privoznik wrote:
> While we all understand that excessive use of ternary operator
> may worsen code readability (e.g. nested, multi-line expression),
> there are few cases where using it actually improves code
> readability. For instance, when a function takes a long list of
> arguments out of which one depends on a boolean expression, or
> when formatting "yes"/"no" or "on"/"off" values based on a
> boolean variable (although one can argue that the latter is a
> subset of the former). Just consider alternatives to:
> 
>   virBufferAsprintf(buf, "<elem>%s</elem>\n", boolVar ? "yes" : "no");
> 
> In fact, this pattern occurs plenty in our code. Exempt it from
> our "no ternary operators" rule.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> Reviewed-by: Claudio Fontana <cfontana at suse.de>
> ---
> 
> v2 of:
> 
> https://listman.redhat.com/archives/libvir-list/2022-July/233150.html
> 
> diff to v1:
> - Changed wording, as suggested by Daniel.
> 
>  docs/coding-style.rst | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/docs/coding-style.rst b/docs/coding-style.rst
> index bf0a80fbc5..81bd4474f1 100644
> --- a/docs/coding-style.rst
> +++ b/docs/coding-style.rst
> @@ -470,7 +470,9 @@ Pointer comparisons may be shortened. All long forms are okay.
>      if (!foo)                # or: if (foo == NULL)
>  
>  New code should avoid the ternary operator as much as possible.
> -Specifically it must never span more than one line or nest:
> +Its usage in basic cases is warranted (e.g. when deciding between
> +two constant strings), however, it must never span more than one
> +line or nest.
>  
>  ::
>  
> @@ -481,6 +483,9 @@ Specifically it must never span more than one line or nest:
>  
>      char *foo = bar ? bar->baz ? bar->baz->foo : "nobaz" : "nobar";
>  
> +  GOOD:
> +    virBufferAsprintf(buf, "<element>%s</element>\n", boolVar ? "yes" : "no");
> +
>  Preprocessor
>  ------------

Reviewed-by: Daniel P. Berrang? <berrange at redhat.com>


With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From lin.a.yang at intel.com  Mon Jul 25 22:01:57 2022
From: lin.a.yang at intel.com (Yang, Lin A)
Date: Mon, 25 Jul 2022 22:01:57 +0000
Subject: [libvirt][PATCH v13 3/6] Convert QMP capabilities to domain
 capabilities
In-Reply-To: <ffe8fc4b-376f-0aa9-cab7-d6cad6bb360a@redhat.com>
References: <20220701191446.727066-1-lin.a.yang@intel.com>
 <20220701191446.727066-4-lin.a.yang@intel.com>
 <0040ffc0-ab7a-3044-2dfa-866cf1d50623@redhat.com>
 <MW4PR11MB5909B50226B9A783D694AC0591959@MW4PR11MB5909.namprd11.prod.outlook.com>
 <ffe8fc4b-376f-0aa9-cab7-d6cad6bb360a@redhat.com>
Message-ID: <MN0PR11MB59870CAA7E9012894CFB284FD4959@MN0PR11MB5987.namprd11.prod.outlook.com>

> BTW: I've discussed with Yang that I'll fix up these patches and resend.
> Is that agreement still on?

Yes, it's still on. Please go ahead. 
I just didn't get chance to sync with Haibin after we made agreement
last week.

Thanks,
Lin.


From marcandre.lureau at redhat.com  Tue Jul 26 08:32:32 2022
From: marcandre.lureau at redhat.com (marcandre.lureau at redhat.com)
Date: Tue, 26 Jul 2022 12:32:32 +0400
Subject: [PATCH] RFC: char: deprecate usage of bidirectional pipe
Message-ID: <20220726083232.2567756-1-marcandre.lureau@redhat.com>

From: Marc-Andr? Lureau <marcandre.lureau at redhat.com>

As Ed Swierk explained back in 2006:
https://lists.nongnu.org/archive/html/qemu-devel/2006-12/msg00160.html

"When qemu writes into the pipe, it immediately reads back what it just
wrote and treats it as a monitor command, endlessly breathing its own
exhaust."

This is similarly confusing when using the chardev with a serial device,
as reported in https://bugzilla.redhat.com/show_bug.cgi?id=2106975.

It seems we have kept the support for bidirectional pipes for historical
reasons and odd systems, however it's not documented in qemu -chardev
options. I suggest to stop supporting it, for portability reasons.

Signed-off-by: Marc-Andr? Lureau <marcandre.lureau at redhat.com>
---
 docs/about/deprecated.rst | 6 ++++++
 chardev/char-pipe.c       | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 7ee26626d5cf..dd5ca30d527b 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -45,6 +45,12 @@ transmit audio through the VNC protocol.
 ``tty`` and ``parport`` are aliases that will be removed. Instead, the
 actual backend names ``serial`` and ``parallel`` should be used.
 
+``-chardev pipe`` support for bidirectional pipes (since 7.1)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+For portability reasons, the support for bidirectional ``pipe`` will
+be removed. Instead, use ``file.in`` & ``file.out`` unidirectional pipes.
+
 Short-form boolean options (since 6.0)
 ''''''''''''''''''''''''''''''''''''''
 
diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
index 66d3b8509183..7db963035e7d 100644
--- a/chardev/char-pipe.c
+++ b/chardev/char-pipe.c
@@ -27,6 +27,7 @@
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
+#include "qemu/error-report.h"
 #include "chardev/char.h"
 
 #ifdef _WIN32
@@ -142,6 +143,9 @@ static void qemu_chr_open_pipe(Chardev *chr,
         if (fd_out >= 0) {
             close(fd_out);
         }
+        warn_report("Support for bidirectional pipe is deprecated,");
+        warn_report("please use portable one-way pipes instead (%s.in & %s.out).",
+                    filename, filename);
         TFR(fd_in = fd_out = qemu_open_old(filename, O_RDWR | O_BINARY));
         if (fd_in < 0) {
             error_setg_file_open(errp, errno, filename);
-- 
2.37.0.rc0


From berrange at redhat.com  Tue Jul 26 08:44:25 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Tue, 26 Jul 2022 09:44:25 +0100
Subject: [PATCH] RFC: char: deprecate usage of bidirectional pipe
In-Reply-To: <20220726083232.2567756-1-marcandre.lureau@redhat.com>
References: <20220726083232.2567756-1-marcandre.lureau@redhat.com>
Message-ID: <Yt+pabvylcNdh0wL@redhat.com>

On Tue, Jul 26, 2022 at 12:32:32PM +0400, marcandre.lureau at redhat.com wrote:
> From: Marc-Andr? Lureau <marcandre.lureau at redhat.com>
> 
> As Ed Swierk explained back in 2006:
> https://lists.nongnu.org/archive/html/qemu-devel/2006-12/msg00160.html
> 
> "When qemu writes into the pipe, it immediately reads back what it just
> wrote and treats it as a monitor command, endlessly breathing its own
> exhaust."
> 
> This is similarly confusing when using the chardev with a serial device,
> as reported in https://bugzilla.redhat.com/show_bug.cgi?id=2106975.
> 
> It seems we have kept the support for bidirectional pipes for historical
> reasons and odd systems, however it's not documented in qemu -chardev
> options. I suggest to stop supporting it, for portability reasons.

Hmm, I always assumed that in this scenario the pipe was operating
in output-only mode. Obviously not the case with the code as it
exists, but perhaps this would be useful ?  eg its good as a serial
console logging mechanism at least.

> 
> Signed-off-by: Marc-Andr? Lureau <marcandre.lureau at redhat.com>
> ---
>  docs/about/deprecated.rst | 6 ++++++
>  chardev/char-pipe.c       | 4 ++++
>  2 files changed, 10 insertions(+)
> 
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 7ee26626d5cf..dd5ca30d527b 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -45,6 +45,12 @@ transmit audio through the VNC protocol.
>  ``tty`` and ``parport`` are aliases that will be removed. Instead, the
>  actual backend names ``serial`` and ``parallel`` should be used.
>  
> +``-chardev pipe`` support for bidirectional pipes (since 7.1)
> +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
> +
> +For portability reasons, the support for bidirectional ``pipe`` will
> +be removed. Instead, use ``file.in`` & ``file.out`` unidirectional pipes.
> +
>  Short-form boolean options (since 6.0)
>  ''''''''''''''''''''''''''''''''''''''
>  
> diff --git a/chardev/char-pipe.c b/chardev/char-pipe.c
> index 66d3b8509183..7db963035e7d 100644
> --- a/chardev/char-pipe.c
> +++ b/chardev/char-pipe.c
> @@ -27,6 +27,7 @@
>  #include "qemu/main-loop.h"
>  #include "qemu/module.h"
>  #include "qemu/option.h"
> +#include "qemu/error-report.h"
>  #include "chardev/char.h"
>  
>  #ifdef _WIN32
> @@ -142,6 +143,9 @@ static void qemu_chr_open_pipe(Chardev *chr,
>          if (fd_out >= 0) {
>              close(fd_out);
>          }
> +        warn_report("Support for bidirectional pipe is deprecated,");
> +        warn_report("please use portable one-way pipes instead (%s.in & %s.out).",
> +                    filename, filename);
>          TFR(fd_in = fd_out = qemu_open_old(filename, O_RDWR | O_BINARY));
>          if (fd_in < 0) {
>              error_setg_file_open(errp, errno, filename);
> -- 
> 2.37.0.rc0
> 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From pkrempa at redhat.com  Tue Jul 26 08:52:49 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 10:52:49 +0200
Subject: [PATCH v2 0/2] docs: Document reviewing and issue handling
Message-ID: <cover.1658825473.git.pkrempa@redhat.com>

Following changes to the respective v1 versions of these patches:

Peter Krempa (2):
  docs: patches: Add a note about reviews and contacting developers
    - followed Erik's suggestion to add bulletpoint instead of a blob
      of text
  docs: Add article about handling upstream issues
     (previously not reviewed)
    - fixed spelling and re-formulated some sentences

 docs/docs.rst               |   3 +
 docs/issue-handling.rst     | 174 ++++++++++++++++++++++++++++++++++++
 docs/meson.build            |   1 +
 docs/submitting-patches.rst |  22 +++++
 4 files changed, 200 insertions(+)
 create mode 100644 docs/issue-handling.rst

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 08:52:50 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 10:52:50 +0200
Subject: [PATCH v2 1/2] docs: patches: Add a note about reviews and contacting
 developers
In-Reply-To: <cover.1658825473.git.pkrempa@redhat.com>
References: <cover.1658825473.git.pkrempa@redhat.com>
Message-ID: <7038f04d98a8190ff5f5d4ce1b43b70571b983cf.1658825473.git.pkrempa@redhat.com>

Add a note outling best practices around review and responding to it.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 docs/submitting-patches.rst | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/docs/submitting-patches.rst b/docs/submitting-patches.rst
index 7bc22323ee..965e381cc1 100644
--- a/docs/submitting-patches.rst
+++ b/docs/submitting-patches.rst
@@ -89,3 +89,25 @@ Moreover, such patch needs to be prefixed correctly with
 ``--subject-prefix=PATCHv2`` appended to
 ``git send-email`` (substitute ``v2`` with the
 correct version if needed though).
+
+Reviews
+-------
+
+Reviewing patches may take a lot of effort and review bandwidth is a limited
+resource for open source projects. Here are a few rules to follow to streamline
+the process:
+
+ - **don't** contact individual maintainers/developers directly with your
+   patches; reviewers are subscribed to the mailing list
+ - **do** be patient; reviewers may be busy
+ - **do** respond to reviewer's questions
+ - **don't** ignore a suggestion from a reviewer; if you disagree discuss it on
+   the list before sending a new version
+ - **do** remind us of your patches on the list if they haven't gotten any
+   attention for a prolonged period (> week) by replying to your patches with a
+   "ping"
+ - **do** test your pathches before sending
+
+You can also help out by reviewing other patches on the list if you feel
+comfortable. Don't hesitate to point out apparent problems in idividual patches,
+you are not obliged to review the whole series.
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 08:52:51 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 10:52:51 +0200
Subject: [PATCH v2 2/2] docs: Add article about handling upstream issues
In-Reply-To: <cover.1658825473.git.pkrempa@redhat.com>
References: <cover.1658825473.git.pkrempa@redhat.com>
Message-ID: <b0a4d327f156968451f5ace9682596d13569a75a.1658825473.git.pkrempa@redhat.com>

Outline how upstream issues are triaged and explain what the states of
the issue means.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 docs/docs.rst           |   3 +
 docs/issue-handling.rst | 174 ++++++++++++++++++++++++++++++++++++++++
 docs/meson.build        |   1 +
 3 files changed, 178 insertions(+)
 create mode 100644 docs/issue-handling.rst

diff --git a/docs/docs.rst b/docs/docs.rst
index 8ca0afdc1a..daba35ca15 100644
--- a/docs/docs.rst
+++ b/docs/docs.rst
@@ -139,6 +139,9 @@ Project development
 `CI <ci.html>`__
    Details on our Continuous Integration

+`Upstream issue handling <issue-handling.html>`__
+   Outlines the handling of issues and describes the states the issue can be in.
+
 `Bug reports <bugs.html>`__
    How and where to report bugs and request features

diff --git a/docs/issue-handling.rst b/docs/issue-handling.rst
new file mode 100644
index 0000000000..26f3ff4e40
--- /dev/null
+++ b/docs/issue-handling.rst
@@ -0,0 +1,174 @@
+=========================
+Handling of gitlab issues
+=========================
+
+.. contents::
+
+This document describes the life cycle and handling of upstream gitlab issues.
+Issues aggregate bug reports, feature requests, user questions and discussions.
+
+For members of the project this is a guideline how to handle issues and how to
+transition them between states based on the interaction with the reporter.
+
+It is important that we try to keep the issues organized and labeled. Otherwise
+it's not pleasant to go through everything and try to weed out and fix once
+
+For others it's an outline what to expect when filing an issue.
+
+Types of issues
+---------------
+
+Generally we use the following issue types based on the individual request. A
+gitlab *scoped label* of the ``kind::`` set is used to label the type of an
+issue. Each issue should have one of these once it's triaged.
+
+Issues can be freely moved between various kinds if needed.
+
+Bugs - ``kind::bug``
+~~~~~~~~~~~~~~~~~~~~
+
+The issue describes a flaw in the functionality. Generally the user should
+describe how to reproduce the issue and add `debug logs`_ or a backtrace of all
+threads in case when any of the components crashed.
+
+Feature requests - ``kind::enhancement``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Issue describes non-existing functionality the user would like to add to
+libvirt. Generally the issue should first focus on what the user wants to
+achieve rather than any form of technical detail so that it's obvious what
+the end goal is.
+
+Technicalities can be described later but should not be the main focus of the
+initial report. With a clear end-goal it's sometimes possible to recommend
+another solution with the same impact.
+
+User support queries - ``kind::support``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+This label is used for issues which don't directly correspond to a flaw or
+missing feature in the project but rather outline a users query about usage.
+
+Discussions - ``kind::discussion``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Any form of discussion which doesn't directly concern any bug or feature request.
+
+States of issues
+----------------
+
+The state of issue helps the maintainers to filter out issues which need
+attention, thus please update the state as appropriate.
+
+Confirmed issues - ``state::confirmed``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In case of ``kind::bug`` issues the **confirmed** state means that there is
+a real problem with the functionality and there is (seemingly) enough
+information to figure out where the problem is and fix it.
+
+``kind::enhancement`` issues should be marked as **confirmed** as long as the
+general idea of the required functionality makes sense and would be in line
+of the general project strategy.
+
+**Note:** Unless the issue is assigned to a specific person, the **confirmed**
+state does not necessarily mean that anybody is actively looking to implement
+the functionality or fix the problem. See the `disclaimer`_.
+
+Unconfirmed issues - ``state::unconfirmed``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``kind::bug`` issues are considered **unconfirmed** when there is seemingly
+enough information describing the problem, but the triager is not sure whether
+the problem would be considered a bug.
+
+In case of ``kind::enhancement`` issues the **unconfirmed** state is similarly
+used for feature requests which might not make sense.
+
+In general use of the **unconfirmed** state should be avoided if possible,
+although if an initial triager requests all necessary information from the
+reporter, but is not sure about the issue itself it's okay to defer it to
+somebody else by setting the ``state::unconfirmed`` label and thus deferring it
+to somebody with more knowledge about the code.
+
+Issues needing additional information from reporter - ``state::needinfo``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If additional information is requested from the reporter of the Issue the
+``state:needinfo`` label should be added, so that the issues can be easily
+filtered.
+
+If the reporter doesn't respond to the request after sufficient amount of time
+(at least 2 weeks) the issue should be closed prompting the reporter to reopen
+once they provide the required information.
+
+Triage process
+--------------
+
+The following steps should be applied to any new issue reported.
+
+ * Set the labels categorrizing the area of the issue, e.g. ``driver-qemu``,
+   ``virsh``, ``xml`` etc. If an appropriate label is not available add it.
+
+ * Check whether the reported sufficiently described the problem or request.
+   If something is missing or unclear, ask for additional data and set
+   ``state::needinfo``.
+
+ * Once all requested information is provided set the appropriate state:
+    - ``state::confirmed`` if you are certain where the bug is or that the
+      feature request makes sense
+    - ``state::unconfirmed`` to defer the investigation to somebody else
+
+Issues needing attention
+------------------------
+
+The following gitlab search queries provide lists of issues which require
+attention from the upstream community.
+
+  `Untriaged issues`_
+    Issues which didn't undergo the `Triage process`_ yet.
+
+  `Unconfirmed bugs`_
+    Bugs which should have all the information needed but the initial triager
+    couldn't determine and confirm the problem.
+
+  `Unconfirmed features`_
+    Feature requests having the proper description of the request but it's not
+    yet clear whether the feature makes sense.
+
+Assigning issues
+----------------
+
+When you plan to address an issue please assign it to yourself to indicate that
+there's somebody working on it and prevent duplicated work.
+
+Contribution possibility for non-members of the project
+-------------------------------------------------------
+
+Anyone is very welcome to assist in handling and triage of issues. Non-members
+of the project don't have permissions to set the labels mentioned above, but
+that is not a problem. You can always describe your findings, prompt the
+reporter to provide more information (obviously adhering to the
+`code of conduct`_) or even analyze where the problem lies and post a comment.
+
+This will help the project members and they'll do the flag setting afterwards.
+
+Disclaimer
+----------
+
+Please note that libvirt, like most open source projects, relies on
+contributors who have motivation, skills and available time to work on
+implementing particular features or fixing bugs as well as assisting the
+upstream community.
+
+Reporting an issue can be helpful for determining demand and interest or
+reporting a problem, but doing so is not a guarantee that a contributor will
+volunteer to implement or fix it. We welcome and encourage even draft patches
+to implement a feature be sent to the mailing list where it can be discussed
+and developed further by the community.
+
+.. _Untriaged issues: https://gitlab.com/libvirt/libvirt/-/issues/?sort=created_date&state=opened&not%5Blabel_name%5D%5B%5D=state%3A%3Aunconfirmed&not%5Blabel_name%5D%5B%5D=state%3A%3Aneedinfo&not%5Blabel_name%5D%5B%5D=state%3A%3Aconfirmed&first_page_size=100
+.. _Unconfirmed bugs: https://gitlab.com/libvirt/libvirt/-/issues/?sort=created_date&state=opened&label_name%5B%5D=kind%3A%3Abug&label_name%5B%5D=state%3A%3Aunconfirmed&first_page_size=100
+.. _Unconfirmed features: https://gitlab.com/libvirt/libvirt/-/issues/?sort=created_date&state=opened&label_name%5B%5D=kind%3A%3Aenhancement&label_name%5B%5D=state%3A%3Aunconfirmed&first_page_size=100
+.. _debug logs: https://libvirt.org/kbase/debuglogs.html
+.. _code of conduct: governance.html#code-of-conduct
diff --git a/docs/meson.build b/docs/meson.build
index 0b16d64488..39c60f9034 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -83,6 +83,7 @@ docs_rst_files = [
   'governance',
   'hacking',
   'hooks',
+  'issue-handling',
   'java',
   'libvirt-go',
   'libvirt-go-xml',
-- 
2.36.1


From jdenemar at redhat.com  Tue Jul 26 09:12:16 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Tue, 26 Jul 2022 11:12:16 +0200 (CEST)
Subject: Entering freeze for libvirt-8.6.0
Message-ID: <20220726091216.DD4BA180147@rein.int.mamuti.net>

I have just tagged v8.6.0-rc1 in the repository and pushed signed
tarballs and source RPMs to https://libvirt.org/sources/

Please give the release candidate some testing and in case you find a
serious issue which should have a fix in the upcoming release, feel
free to reply to this thread to make sure the issue is more visible.

If you have not done so yet, please update NEWS.rst to document any
significant change you made since the last release.

Thanks,

Jirka

From mkletzan at redhat.com  Tue Jul 26 10:44:29 2022
From: mkletzan at redhat.com (Martin Kletzander)
Date: Tue, 26 Jul 2022 12:44:29 +0200
Subject: [PATCH 3/3] qemu_driver: use qemuMonitorQueryStats to extract
 halt poll time
In-Reply-To: <20220724052036.3ilm34szd5hdvu3g@Satori>
References: <20220714055204.1277661-1-natto@weirdnatto.in>
 <20220714055204.1277661-4-natto@weirdnatto.in>
 <YtrFrVNizFip3ttn@wheatley>
 <cd716676-0aea-4e6a-dbbd-c6e38cfb93ab@redhat.com>
 <20220724052036.3ilm34szd5hdvu3g@Satori>
Message-ID: <Yt/FjYqFeKMKiff9@wheatley>

On Sun, Jul 24, 2022 at 10:50:36AM +0530, Amneesh Singh wrote:
>On Fri, Jul 22, 2022 at 07:09:57PM +0200, Paolo Bonzini wrote:
>> On 7/22/22 17:43, Martin Kletzander wrote:
>> > As mentioned before, all these failures do not have to exit the
>> > function, but rather fallback to the old way.  You can even create
>> > two new functions for the new and old implementations and then call
>> > them from here to make the fallback easier to spot (and code).
>>
>> More precisely, they should just "continue;" to the next iteration of
>> the for loop, like
>>
>>
>>             if (!success_obj || !fail_obj)
>>                 continue;
>>
>>             found = true;
>>
>> and then go fall back if found is false at the end of the loop.
>>
>> On the other hand, here:
>>
>>             if (virJSONValueGetNumberUlong(success_obj, &curHaltPollSuccess) < 0)
>>                 return 0;
>>
>>             if (virJSONValueGetNumberUlong(fail_obj, &curHaltPollFail) < 0)
>>                 return 0;
>>
>> I am not sure about falling back, because it is really an unexpected
>> situation where the statistic exist but somehow the value cannot be
>> parsed.

The main thing I was worried about was libvirtd crashing on possibly expoited
qemu process.  Whether we fall back or report nothing in this case is not that
big of a deal, since there's something wrong already anyway.

>Then can we just "continue;" in case the value fails to parse as well?
>>

That's another option as well.

>> Paolo
>>
>> > I wanted to change this before pushing as well, but I feel like I'm
>> > changing too much of your code.  And I also had to rebase this
>> > (although trivially). Would you mind just changing these few last
>> > things so that we can get it in before the rc0 freeze?
>Alright, as soon as there is a viable check decided for the virJSONValueGet*
>statements above, I will push a v4 with the changes you mentioned in
>your reviews. Thank you both for taking the time to review.
>>


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220726/877d2f8c/attachment-0001.sig>

From eskultet at redhat.com  Tue Jul 26 10:52:59 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 26 Jul 2022 12:52:59 +0200
Subject: [PATCH v2 1/2] docs: patches: Add a note about reviews and
 contacting developers
In-Reply-To: <7038f04d98a8190ff5f5d4ce1b43b70571b983cf.1658825473.git.pkrempa@redhat.com>
References: <cover.1658825473.git.pkrempa@redhat.com>
 <7038f04d98a8190ff5f5d4ce1b43b70571b983cf.1658825473.git.pkrempa@redhat.com>
Message-ID: <Yt/Hi72flO5YqvZI@nautilus.home.lan>

On Tue, Jul 26, 2022 at 10:52:50AM +0200, Peter Krempa wrote:
> Add a note outling best practices around review and responding to it.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  docs/submitting-patches.rst | 22 ++++++++++++++++++++++
>  1 file changed, 22 insertions(+)
> 
> diff --git a/docs/submitting-patches.rst b/docs/submitting-patches.rst
> index 7bc22323ee..965e381cc1 100644
> --- a/docs/submitting-patches.rst
> +++ b/docs/submitting-patches.rst
> @@ -89,3 +89,25 @@ Moreover, such patch needs to be prefixed correctly with
>  ``--subject-prefix=PATCHv2`` appended to
>  ``git send-email`` (substitute ``v2`` with the
>  correct version if needed though).
> +
> +Reviews

I think 'Review process' sounds better

> +-------
> +
> +Reviewing patches may take a lot of effort and review bandwidth is a limited

I'd reword this a bit:

'Reviewing patches...lot of effort with review bandwidth being limited in
open source projects'

and the reason for this being that if not read carefully until the
end of the sentence, what you'll see is '(a lot of effort AND review bandwidth)'
as a direct connection to the first part of the sentence with the rest of the
sentence then making no sense.
I apologize if I suggested that wording in the previous revision of this patch.

> +resource for open source projects. Here are a few rules to follow to streamline
> +the process:
> +
> + - **don't** contact individual maintainers/developers directly with your
> +   patches; reviewers are subscribed to the mailing list
> + - **do** be patient; reviewers may be busy
> + - **do** respond to reviewer's questions
> + - **don't** ignore a suggestion from a reviewer; if you disagree discuss it on
> +   the list before sending a new version
> + - **do** remind us of your patches on the list if they haven't gotten any
> +   attention for a prolonged period (> week) by replying to your patches with a

s/week/1 week/

> +   "ping"
> + - **do** test your pathches before sending

s/pathches/patches

> +
> +You can also help out by reviewing other patches on the list if you feel
> +comfortable. Don't hesitate to point out apparent problems in idividual patches,
> +you are not obliged to review the whole series.

It would be probably better to invert the last sentence to:

"Don't feel obliged to review whole patch series if you see any major problems
in any of the comprising patches - just point them out and let the author to
respin the series."

Reviewed-by: Erik Skultety <eskultet at redhat.com>


From eskultet at redhat.com  Tue Jul 26 13:07:10 2022
From: eskultet at redhat.com (Erik Skultety)
Date: Tue, 26 Jul 2022 15:07:10 +0200
Subject: [PATCH v2 2/2] docs: Add article about handling upstream issues
In-Reply-To: <b0a4d327f156968451f5ace9682596d13569a75a.1658825473.git.pkrempa@redhat.com>
References: <cover.1658825473.git.pkrempa@redhat.com>
 <b0a4d327f156968451f5ace9682596d13569a75a.1658825473.git.pkrempa@redhat.com>
Message-ID: <Yt/m/tC7OJilvnz7@nautilus.home.lan>

On Tue, Jul 26, 2022 at 10:52:51AM +0200, Peter Krempa wrote:
> Outline how upstream issues are triaged and explain what the states of
> the issue means.
> 
> Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> ---
>  docs/docs.rst           |   3 +
>  docs/issue-handling.rst | 174 ++++++++++++++++++++++++++++++++++++++++
>  docs/meson.build        |   1 +
>  3 files changed, 178 insertions(+)
>  create mode 100644 docs/issue-handling.rst
> 
> diff --git a/docs/docs.rst b/docs/docs.rst
> index 8ca0afdc1a..daba35ca15 100644
> --- a/docs/docs.rst
> +++ b/docs/docs.rst
> @@ -139,6 +139,9 @@ Project development
>  `CI <ci.html>`__
>     Details on our Continuous Integration
> 
> +`Upstream issue handling <issue-handling.html>`__
> +   Outlines the handling of issues and describes the states the issue can be in.

Outlines the process of handling issues as well as describes the supported
issue types along with their life cycle.

> +
>  `Bug reports <bugs.html>`__
>     How and where to report bugs and request features
> 
> diff --git a/docs/issue-handling.rst b/docs/issue-handling.rst
> new file mode 100644
> index 0000000000..26f3ff4e40
> --- /dev/null
> +++ b/docs/issue-handling.rst
> @@ -0,0 +1,174 @@
> +=========================
> +Handling of gitlab issues
> +=========================
> +
> +.. contents::
> +
> +This document describes the life cycle and handling of upstream gitlab issues.
> +Issues aggregate bug reports, feature requests, user questions and discussions.

s/Issues/Issue (in GitLab's sense)
s/aggregate/is an aggregate term for

> +
> +For members of the project this is a guideline how to handle issues and how to
> +transition them between states based on the interaction with the reporter.
> +
> +It is important that we try to keep the issues organized and labeled. Otherwise
> +it's not pleasant to go through everything and try to weed out and fix once

I don't think a sentence should start with 'Otherwise', how about:

It is imperative we collaboratively keep the issues organized and labeled,
otherwise we'll end up creating an unnecessary maintenance burden for us.

> +
> +For others it's an outline what to expect when filing an issue.

s/For others/For others,/
s/it's an outline/this article should only server as an outline

> +
> +Types of issues
> +---------------
> +
> +Generally we use the following issue types based on the individual request. A
> +gitlab *scoped label* of the ``kind::`` set is used to label the type of an
> +issue. Each issue should have one of these once it's triaged.
> +
> +Issues can be freely moved between various kinds if needed.

'Every issue in our GitLab tracker bears the ``kind::`` namespace prefix. Once
triaged, each issue will have one of the following types assigned to it.
Note that issues can be moved freely between the different issue kinds if
needed.

> +
> +Bugs - ``kind::bug``
> +~~~~~~~~~~~~~~~~~~~~
> +
> +The issue describes a flaw in the functionality. Generally the user should

s/The/This
s/Generally//

'The user is expected to'

> +describe how to reproduce the issue and add `debug logs`_ or a backtrace of all
> +threads in case when any of the components crashed.

s/threads/daemon worker threads
s/when any/any

> +
> +Feature requests - ``kind::enhancement``
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +Issue describes non-existing functionality the user would like to add to

s/^Issue/This issue type/

> +libvirt. Generally the issue should first focus on what the user wants to

s/Generally/Generally,

> +achieve rather than any form of technical detail so that it's obvious what
> +the end goal is.
> +
> +Technicalities can be described later but should not be the main focus of the

s/Technicalities/Detailed technical aspects

> +initial report. With a clear end-goal it's sometimes possible to recommend
> +another solution with the same impact.
> +
> +User support queries - ``kind::support``
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +This label is used for issues which don't directly correspond to a flaw or
> +missing feature in the project but rather outline a users query about usage.

s/for/with
s/missing/a missing
s/but rather .*$/like usage-related queries

> +
> +Discussions - ``kind::discussion``
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +Any form of discussion which doesn't directly concern any bug or feature request.

s/doesn't directly concern any/isn't related to any existing/

> +
> +States of issues
> +----------------
> +
> +The state of issue helps the maintainers to filter out issues which need

'States allow project maintainers filtering out issues which need attention, so
please keep the issue state updated at all times.'

> +attention, thus please update the state as appropriate.
> +
> +Confirmed issues - ``state::confirmed``
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +In case of ``kind::bug`` issues the **confirmed** state means that there is
> +a real problem with the functionality and there is (seemingly) enough
> +information to figure out where the problem is and fix it.
> +
> +``kind::enhancement`` issues should be marked as **confirmed** as long as the
> +general idea of the required functionality makes sense and would be in line
> +of the general project strategy.

s/general project/project

> +
> +**Note:** Unless the issue is assigned to a specific person, the **confirmed**
> +state does not necessarily mean that anybody is actively looking to implement
> +the functionality or fix the problem. See the `disclaimer`_.
> +
> +Unconfirmed issues - ``state::unconfirmed``
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +``kind::bug`` issues are considered **unconfirmed** when there is seemingly
> +enough information describing the problem, but the triager is not sure whether
> +the problem would be considered a bug.
> +
> +In case of ``kind::enhancement`` issues the **unconfirmed** state is similarly
> +used for feature requests which might not make sense.
> +
> +In general use of the **unconfirmed** state should be avoided if possible,
> +although if an initial triager requests all necessary information from the

s/if an/if the

> +reporter, but is not sure about the issue itself it's okay to defer it to
> +somebody else by setting the ``state::unconfirmed`` label and thus deferring it
> +to somebody with more knowledge about the code.
> +
> +Issues needing additional information from reporter - ``state::needinfo``
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +If additional information is requested from the reporter of the Issue the

s/Issue/issue

> +``state:needinfo`` label should be added, so that the issues can be easily
> +filtered.
> +
> +If the reporter doesn't respond to the request after sufficient amount of time

s/after sufficient amount of time/in a timely manner (~2 weeks)

> +(at least 2 weeks) the issue should be closed prompting the reporter to reopen
> +once they provide the required information.
> +
> +Triage process
> +--------------
> +
> +The following steps should be applied to any new issue reported.
> +
> + * Set the labels categorrizing the area of the issue, e.g. ``driver-qemu``,
> +   ``virsh``, ``xml`` etc. If an appropriate label is not available add it.

s/not available/not available,/

> +
> + * Check whether the reported sufficiently described the problem or request.

s/reported/reporter
s/sufficiently//
s/problem or request/issue sufficiently

> +   If something is missing or unclear, ask for additional data and set
> +   ``state::needinfo``.
> +
> + * Once all requested information is provided set the appropriate state:
> +    - ``state::confirmed`` if you are certain where the bug is or that the
> +      feature request makes sense
> +    - ``state::unconfirmed`` to defer the investigation to somebody else
> +
> +Issues needing attention
> +------------------------
> +
> +The following gitlab search queries provide lists of issues which require
> +attention from the upstream community.
> +
> +  `Untriaged issues`_
> +    Issues which didn't undergo the `Triage process`_ yet.

s/didn't undergo/haven't undergone

> +
> +  `Unconfirmed bugs`_
> +    Bugs which should have all the information needed but the initial triager
> +    couldn't determine and confirm the problem.

s/and/nor

> +
> +  `Unconfirmed features`_
> +    Feature requests having the proper description of the request but it's not
> +    yet clear whether the feature makes sense.
> +
> +Assigning issues
> +----------------
> +
> +When you plan to address an issue please assign it to yourself to indicate that

s/when/if

> +there's somebody working on it and prevent duplicated work.

s/prevent/thus prevent

> +
> +Contribution possibility for non-members of the project
> +-------------------------------------------------------
> +
> +Anyone is very welcome to assist in handling and triage of issues. Non-members
> +of the project don't have permissions to set the labels mentioned above, but
> +that is not a problem. You can always describe your findings, prompt the
> +reporter to provide more information (obviously adhering to the
> +`code of conduct`_) or even analyze where the problem lies and post a comment.
> +

'Even though non-members don't have...., you can always post a comment to the
issue, describing your findings or prompt the ... where the problem lies
followed by submitting a patch to the mailing list.'

> +This will help the project members and they'll do the flag setting afterwards.

'Someone from the project members will then take care of applying the correct
label to the issue'

> +
> +Disclaimer
> +----------
> +
> +Please note that libvirt, like most open source projects, relies on
> +contributors who have motivation, skills and available time to work on
> +implementing particular features or fixing bugs as well as assisting the
> +upstream community.
> +
> +Reporting an issue can be helpful for determining demand and interest or
> +reporting a problem, but doing so is not a guarantee that a contributor will
> +volunteer to implement or fix it. We welcome and encourage even draft patches
> +to implement a feature be sent to the mailing list where it can be discussed
> +and developed further by the community.

'We even welcome and encourage draft patches implementing a feature to be sent
to the ... where they can be discussed and further improved by the community.'

Couple of nit picks, but:
Reviewed-by: Erik Skultety <eskultet at redhat.com>


From berrange at redhat.com  Tue Jul 26 14:16:50 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Tue, 26 Jul 2022 15:16:50 +0100
Subject: [libvirt PATCH 0/2] qemu: support stateless UEFI firmware
In-Reply-To: <e31be809-a07a-e9e8-174c-7ffcd27bbe07@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
 <e31be809-a07a-e9e8-174c-7ffcd27bbe07@redhat.com>
Message-ID: <Yt/3Uq+HrA+a2wM/@redhat.com>

On Mon, Jul 25, 2022 at 03:40:41PM +0200, Michal Pr?vozn?k wrote:
> On 7/22/22 18:23, Daniel P. Berrang? wrote:
> > This is to enable SEV builds of UEFI which provide only a single CODE.fd
> > file, with not VARS.fd.
> > 
> > Daniel P. Berrang? (2):
> >   conf: support stateless UEFI firmware
> >   qemu: support use of stateless EFI firmware
> > 
> >  docs/formatdomain.rst                         |  9 +++-
> >  src/conf/domain_conf.c                        |  9 ++++
> >  src/conf/domain_conf.h                        |  1 +
> >  src/conf/domain_validate.c                    | 26 ++++++++++
> >  src/conf/schemas/domaincommon.rng             |  5 ++
> >  src/qemu/qemu_domain.c                        |  3 +-
> >  src/qemu/qemu_firmware.c                      | 48 +++++++++++--------
> >  ...-auto-bios-not-stateless.x86_64-latest.err |  1 +
> >  .../firmware-auto-bios-not-stateless.xml      | 18 +++++++
> >  ...are-auto-bios-stateless.x86_64-latest.args | 32 +++++++++++++
> >  .../firmware-auto-bios-stateless.xml          | 18 +++++++
> >  ...ware-auto-efi-stateless.x86_64-latest.args | 33 +++++++++++++
> >  .../firmware-auto-efi-stateless.xml           | 18 +++++++
> >  .../firmware-manual-bios-not-stateless.err    |  1 +
> >  .../firmware-manual-bios-not-stateless.xml    | 15 ++++++
> >  .../firmware-manual-bios-stateless.args       | 30 ++++++++++++
> >  .../firmware-manual-bios-stateless.xml        | 15 ++++++
> >  ...nual-efi-nvram-stateless.x86_64-latest.err |  1 +
> >  .../firmware-manual-efi-nvram-stateless.xml   | 21 ++++++++
> >  ...nvram-template-stateless.x86_64-latest.err |  1 +
> >  ...re-manual-efi-nvram-template-stateless.xml | 19 ++++++++
> >  ...re-manual-efi-stateless.x86_64-latest.args | 33 +++++++++++++
> >  .../firmware-manual-efi-stateless.xml         | 18 +++++++
> >  tests/qemuxml2argvtest.c                      | 10 ++++
> >  ...ware-auto-bios-stateless.x86_64-latest.xml | 34 +++++++++++++
> >  .../firmware-manual-bios-stateless.xml        | 25 ++++++++++
> >  .../firmware-manual-bios.xml                  | 25 ++++++++++
> >  tests/qemuxml2xmltest.c                       |  3 ++
> >  28 files changed, 451 insertions(+), 21 deletions(-)
> >  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
> >  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
> >  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
> >  create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
> >  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
> >  create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
> >  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
> >  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios.xml
> > 
> 
> Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

ANy objection to me pushing this now, or wait until after freeze is
over ?

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From mprivozn at redhat.com  Tue Jul 26 14:31:16 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Tue, 26 Jul 2022 16:31:16 +0200
Subject: [libvirt PATCH 0/2] qemu: support stateless UEFI firmware
In-Reply-To: <Yt/3Uq+HrA+a2wM/@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
 <e31be809-a07a-e9e8-174c-7ffcd27bbe07@redhat.com>
 <Yt/3Uq+HrA+a2wM/@redhat.com>
Message-ID: <04d1a5a0-6d1e-0333-3609-a3b27230dc0f@redhat.com>

On 7/26/22 16:16, Daniel P. Berrang? wrote:
> On Mon, Jul 25, 2022 at 03:40:41PM +0200, Michal Pr?vozn?k wrote:
>> On 7/22/22 18:23, Daniel P. Berrang? wrote:
>>> This is to enable SEV builds of UEFI which provide only a single CODE.fd
>>> file, with not VARS.fd.
>>>
>>> Daniel P. Berrang? (2):
>>>   conf: support stateless UEFI firmware
>>>   qemu: support use of stateless EFI firmware
>>>
>>>  docs/formatdomain.rst                         |  9 +++-
>>>  src/conf/domain_conf.c                        |  9 ++++
>>>  src/conf/domain_conf.h                        |  1 +
>>>  src/conf/domain_validate.c                    | 26 ++++++++++
>>>  src/conf/schemas/domaincommon.rng             |  5 ++
>>>  src/qemu/qemu_domain.c                        |  3 +-
>>>  src/qemu/qemu_firmware.c                      | 48 +++++++++++--------
>>>  ...-auto-bios-not-stateless.x86_64-latest.err |  1 +
>>>  .../firmware-auto-bios-not-stateless.xml      | 18 +++++++
>>>  ...are-auto-bios-stateless.x86_64-latest.args | 32 +++++++++++++
>>>  .../firmware-auto-bios-stateless.xml          | 18 +++++++
>>>  ...ware-auto-efi-stateless.x86_64-latest.args | 33 +++++++++++++
>>>  .../firmware-auto-efi-stateless.xml           | 18 +++++++
>>>  .../firmware-manual-bios-not-stateless.err    |  1 +
>>>  .../firmware-manual-bios-not-stateless.xml    | 15 ++++++
>>>  .../firmware-manual-bios-stateless.args       | 30 ++++++++++++
>>>  .../firmware-manual-bios-stateless.xml        | 15 ++++++
>>>  ...nual-efi-nvram-stateless.x86_64-latest.err |  1 +
>>>  .../firmware-manual-efi-nvram-stateless.xml   | 21 ++++++++
>>>  ...nvram-template-stateless.x86_64-latest.err |  1 +
>>>  ...re-manual-efi-nvram-template-stateless.xml | 19 ++++++++
>>>  ...re-manual-efi-stateless.x86_64-latest.args | 33 +++++++++++++
>>>  .../firmware-manual-efi-stateless.xml         | 18 +++++++
>>>  tests/qemuxml2argvtest.c                      | 10 ++++
>>>  ...ware-auto-bios-stateless.x86_64-latest.xml | 34 +++++++++++++
>>>  .../firmware-manual-bios-stateless.xml        | 25 ++++++++++
>>>  .../firmware-manual-bios.xml                  | 25 ++++++++++
>>>  tests/qemuxml2xmltest.c                       |  3 ++
>>>  28 files changed, 451 insertions(+), 21 deletions(-)
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.x86_64-latest.err
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-not-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-bios-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-auto-efi-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.err
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-not-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.args
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-bios-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.x86_64-latest.err
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.x86_64-latest.err
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-nvram-template-stateless.xml
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
>>>  create mode 100644 tests/qemuxml2argvdata/firmware-manual-efi-stateless.xml
>>>  create mode 100644 tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.xml
>>>  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios-stateless.xml
>>>  create mode 100644 tests/qemuxml2xmloutdata/firmware-manual-bios.xml
>>>
>>
>> Reviewed-by: Michal Privoznik <mprivozn at redhat.com>
> 
> ANy objection to me pushing this now, or wait until after freeze is
> over ?

Yeah, this is safe for freeze.

Michal


From pkrempa at redhat.com  Tue Jul 26 14:36:38 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:38 +0200
Subject: [PATCH for 8.7.0 00/80] Remove pre-blockdev disk setup code
Message-ID: <cover.1658843187.git.pkrempa@redhat.com>

Starting with libvirt-8.7.0 we'll support qemu-4.2 as minimum and thus
we'll only use -blockdev now. Remove the old cruft.

This series applies on top of the patches bumping minimum qemu version
to qemu-4.2 I've posted earlier.

The whole branch can be fetched at:

 git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-remove-2 

Peter Krempa (80):
  qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE
  qemu: capabilities: Retire QEMU_CAPS_CHANGE_BACKING_FILE
  qemu: Always assume support for QEMU_CAPS_ACTIVE_COMMIT
  qemu: capabilities: Retire QEMU_CAPS_ACTIVE_COMMIT
  qemu: Always assume support for QEMU_CAPS_GLUSTER_DEBUG_LEVEL
  qemu: capabilities: Retire QEMU_CAPS_GLUSTER_DEBUG_LEVEL
  qemu: Always assume support for QEMU_CAPS_DRIVE_DISCARD and
    QEMU_CAPS_DRIVE_DETECT_ZEROES
  qemu: capabilities: Retire QEMU_CAPS_DRIVE_DISCARD and
    QEMU_CAPS_DRIVE_DETECT_ZEROES
  qemuxml2argvtest: Use DO_TEST_CAPS_LATEST for all 'user-aliases' tests
  qemuxml2xmltest: Modernize all test cases using QEMU_CAPS_QCOW2_LUKS
  qemu: Always assume support for QEMU_CAPS_QCOW2_LUKS
  qemu: capabilities: Retire QEMU_CAPS_QCOW2_LUKS
  qemu: capabilities: Unconditionally set
    QEMU_CAPS_BLOCKDEV/QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI
  tests: Force QEMU_CAPS_BLOCKDEV(_HOSTDEV_SCSI) in fake caps tests
  qemu: Refactor access to 'qomName' field of the qemu disk private data
  qemu: command: Always assume support for QEMU_CAPS_SCSI_DISK_DEVICE_ID
  qemu: capabilities: Retire capabilities used for -blockdev detection
  qemu: Remove code conditional on QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI
  qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI
  qemu: block: Remove legacy spellings for InetSocketAddress
  qemu: migration: Remove pre-blockdev code paths
  qemuMigrationSrcNBDStorageCopyBlockdev: Remove some arguments
  qemu: migration: Assume support for QEMU_CAPS_BLOCKDEV_DEL
  qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_DEL
  qemu: snapshot: Remove pre-blockdev code paths
  qemu: Remove unused code for pre-blockdev disk snapshot monitor
    interaction
  qemu: block: Remove pre-blockdev code paths
  qemu: migration_cookie: Remove pre-blockdev code paths
  qemu: validate: Remove impossible validation checks
  qemu: process: Remove pre-blockdev code paths
  qemu: blockjob: Remove legacy block job completion code
  qemu: Remove legacy block job event processing handler
  qemu: monitor: Remove infrastructure for BLOCK_JOB_* events
  qemuDomainSetBlockThreshold: Remove pre-blockdev node name detection
  qemu: block: Remove 'qemuBlockNodeNamesDetect' and related
    infrastructure
  qemu: blockjob: Remove pre-blockdev blockjob setup
  qemu: alias: Remove check for QEMU_CAPS_BLOCKDEV
  qemuDomainGetStatsBlock: Remove pre-blockdev code paths
  qemu: block: Remove unused qemuBlockGetNodeData
  qemu: monitor: Remove unused qemuMonitorQueryNamedBlockNodes and clean
    up
  qemu: driver: Remove pre-blockdev code paths from
    qemuDomainBlockCopyCommon
  qemu: monitor: Remove unused qemuMonitorDriveMirror
  qemu: driver: Remove pre-blockdev code paths from
    qemuDomainBlockCommit
  qemu: monitor: Remove unused arguments of qemuMonitorBlockCommit
  qemu: driver: Remove pre-blockdev code paths from
    qemuDomainBlockPullCommon
  qemu: monitor: Remove unused arguments of qemuMonitorBlockStream
  qemu: monitor: Remove unused qemuMonitorDiskNameLookup
  qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockPivot
  qemu: monitor: Remove unused qemuMonitorDrivePivot
  qemu: command: Remove pre-blockdev floppy setup
  qemu: Remove pre-blockdev PFLASH setup
  qemuDomainBlockResize: Always refuse resize of empty/readonly disks
  qemuDomainBlocksStatsGather: Remove pre-blockdev code paths
  qemu: monitor: Remove unused qemuMonitorBlockStatsUpdateCapacity
  qemu: driver: Remove remaining QEMU_CAPS_BLOCKDEV capability checks
  qemu: hotplug: Remove pre-blockdev code path from
    qemuDomainChangeEjectableMedia
  qemu: monitor: Remove unused qemuMonitor(Eject|Change)Media
  qemuhotplugtest: Switch to -blockdev mode
  qemuDomainRemoveDiskDevice: Remove special casing for disks on 'sd'
    bus
  qemu: hotplug: Remove pre-blockdev code paths
  qemu: block: Remove unused
    qemuBlockStorageSourceChainDetachPrepareLegacy
  qemu: Remove 'driveAlias' argument of
    qemuBlockStorageSourceDetachPrepare
  qemu: block: Remove support for legacy disk hotplug/unplug
  qemu: monitor: Remove unused qemuMonitorAddDrive/qemuMonitorDriveDel
  qemu: command: Delegate qemuBuildDriveStr to SD cards only
  qemu: command: Generate -drive for SD cards via JSON props
  qemu: command: Remove unused qemuGetDriveSourceString
  qemu: domain: Assume QEMU_CAPS_BLOCKDEV for the domain private code
  qemuDomainSecretStorageSourcePrepare: Remove cabapbility check when
    preparing cookies
  qemuDomainDiskBlockJobIsSupported: Assume QEMU_CAPS_BLOCKDEV is
    supported
  qemuDomainDiskGetBackendAlias: Assume QEMU_CAPS_BLOCKDEV is supported
  qemuDomainValidateStorageSource: Remove QEMU_CAPS_BLOCKDEV validation
  qemuDomainValidateStorageSource: Remove 'maskBlockdev' argument
  qemuDomainDetermineDiskChain: Assume QEMU_CAPS_BLOCKDEV
  qemu: Retire QEMU_CAPS_BLOCKDEV
  qemu: Setup disk throttling for SD cards via monitor
  qemu: capabilities: Retire QEMU_CAPS_QUERY_NAMED_BLOCK_NODES
  qemu: Assume support and retire QEMU_CAPS_BLOCK_WRITE_THRESHOLD
  qemu: Assume and retire QEMU_CAPS_BLOCKDEV_BACKUP
  qemuDomainDetermineDiskChain: Remove 'report_broken' argument

 src/qemu/qemu_alias.c                         |  10 +-
 src/qemu/qemu_alias.h                         |   5 +-
 src/qemu/qemu_backup.c                        |  10 +-
 src/qemu/qemu_block.c                         | 461 +-----------
 src/qemu/qemu_block.h                         |  27 +-
 src/qemu/qemu_blockjob.c                      | 170 +----
 src/qemu/qemu_capabilities.c                  |  67 +-
 src/qemu/qemu_capabilities.h                  |  30 +-
 src/qemu/qemu_checkpoint.c                    |   2 +-
 src/qemu/qemu_command.c                       | 655 ++---------------
 src/qemu/qemu_command.h                       |   4 -
 src/qemu/qemu_domain.c                        | 195 ++---
 src/qemu/qemu_domain.h                        |  14 +-
 src/qemu/qemu_driver.c                        | 564 ++++-----------
 src/qemu/qemu_hotplug.c                       | 118 +--
 src/qemu/qemu_migration.c                     | 147 +---
 src/qemu/qemu_migration_cookie.c              |  19 +-
 src/qemu/qemu_monitor.c                       | 184 +----
 src/qemu/qemu_monitor.h                       |  62 --
 src/qemu/qemu_monitor_json.c                  | 447 +-----------
 src/qemu/qemu_monitor_json.h                  |  53 --
 src/qemu/qemu_monitor_text.c                  |  82 ---
 src/qemu/qemu_monitor_text.h                  |   6 -
 src/qemu/qemu_process.c                       | 209 +-----
 src/qemu/qemu_snapshot.c                      | 125 +---
 src/qemu/qemu_validate.c                      |  34 +-
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |   2 +-
 tests/qemublocktest.c                         |   4 +-
 .../caps_4.2.0.aarch64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  11 -
 .../qemucapabilitiesdata/caps_4.2.0.s390x.xml |  15 -
 .../caps_4.2.0.x86_64.xml                     |  15 -
 .../caps_5.0.0.aarch64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |  15 -
 .../caps_5.0.0.riscv64.xml                    |  15 -
 .../caps_5.0.0.x86_64.xml                     |  15 -
 .../qemucapabilitiesdata/caps_5.1.0.sparc.xml |  15 -
 .../caps_5.1.0.x86_64.xml                     |  15 -
 .../caps_5.2.0.aarch64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml |  15 -
 .../caps_5.2.0.riscv64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_5.2.0.s390x.xml |  15 -
 .../caps_5.2.0.x86_64.xml                     |  15 -
 .../caps_6.0.0.aarch64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_6.0.0.s390x.xml |  15 -
 .../caps_6.0.0.x86_64.xml                     |  15 -
 .../caps_6.1.0.x86_64.xml                     |  15 -
 .../caps_6.2.0.aarch64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml |  15 -
 .../caps_6.2.0.x86_64.xml                     |  15 -
 .../caps_7.0.0.aarch64.xml                    |  15 -
 .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml |  15 -
 .../caps_7.0.0.x86_64.xml                     |  15 -
 .../caps_7.1.0.x86_64.xml                     |  15 -
 tests/qemuhotplugtest.c                       |  76 +-
 .../qemuhotplug-base-ccw-live+ccw-virtio.xml  |   2 +-
 ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml |   4 +-
 ...otplug-base-ccw-live-with-2-ccw-virtio.xml |   2 +-
 ...-with-ccw-virtio+ccw-virtio-2-explicit.xml |   2 +-
 ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml |   2 +-
 .../qemuhotplug-base-live+cdrom-scsi.xml      |   2 +-
 .../qemuhotplug-base-live+cdrom-usb.xml       |   2 +-
 ...uhotplug-base-live+disk-scsi-multipath.xml |   2 +-
 ...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml |   2 +-
 .../qemuhotplug-base-live+disk-scsi.xml       |   2 +-
 .../qemuhotplug-base-live+disk-usb.xml        |   2 +-
 .../qemuhotplug-base-live+disk-virtio.xml     |   2 +-
 ...thout-scsi-controller-live+disk-scsi-2.xml |   2 +-
 ...monitorjson-nodename-basic-blockstats.json | 166 -----
 ...onitorjson-nodename-basic-named-nodes.json | 268 -------
 .../qemumonitorjson-nodename-basic.result     |  16 -
 ...itorjson-nodename-blockjob-blockstats.json | 301 --------
 ...torjson-nodename-blockjob-named-nodes.json | 682 ------------------
 .../qemumonitorjson-nodename-blockjob.result  |  26 -
 ...monitorjson-nodename-empty-blockstats.json |   2 -
 ...onitorjson-nodename-empty-named-nodes.json |   2 -
 .../qemumonitorjson-nodename-empty.result     |   0
 ...nitorjson-nodename-gluster-blockstats.json | 111 ---
 ...itorjson-nodename-gluster-named-nodes.json | 135 ----
 .../qemumonitorjson-nodename-gluster.result   |  11 -
 ...monitorjson-nodename-iscsi-blockstats.json | 113 ---
 ...onitorjson-nodename-iscsi-named-nodes.json | 114 ---
 .../qemumonitorjson-nodename-iscsi.result     |  13 -
 ...umonitorjson-nodename-luks-blockstats.json |  58 --
 ...monitorjson-nodename-luks-named-nodes.json | 109 ---
 .../qemumonitorjson-nodename-luks.result      |   6 -
 ...mumonitorjson-nodename-old-blockstats.json | 160 ----
 ...umonitorjson-nodename-old-named-nodes.json |   2 -
 .../qemumonitorjson-nodename-old.result       |   0
 ...itorjson-nodename-relative-blockstats.json | 329 ---------
 ...torjson-nodename-relative-named-nodes.json | 554 --------------
 .../qemumonitorjson-nodename-relative.result  |  33 -
 ...json-nodename-same-backing-blockstats.json | 221 ------
 ...son-nodename-same-backing-named-nodes.json | 316 --------
 ...mumonitorjson-nodename-same-backing.result |  23 -
 tests/qemumonitorjsontest.c                   | 105 +--
 .../blockjob-mirror-in.xml                    |   1 +
 .../migration-in-params-in.xml                |   1 +
 .../migration-out-nbd-out.xml                 |   1 +
 .../migration-out-nbd-tls-out.xml             |   1 +
 .../migration-out-params-in.xml               |   1 +
 tests/qemustatusxml2xmldata/upgrade-out.xml   |   1 +
 .../qemustatusxml2xmldata/vcpus-multi-in.xml  |   1 +
 .../aarch64-aavmf-virtio-mmio.args            |   5 +-
 .../aarch64-cpu-passthrough.args              |   5 +-
 .../aarch64-kvm-32-on-64.args                 |   5 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |   5 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |   5 +-
 .../aarch64-virtio-pci-default.args           |   5 +-
 .../aarch64-virtio-pci-manual-addresses.args  |   5 +-
 .../arm-vexpressa9-virtio.args                |   5 +-
 tests/qemuxml2argvdata/arm-virt-virtio.args   |   5 +-
 tests/qemuxml2argvdata/audio-default-sdl.args |   5 +-
 .../qemuxml2argvdata/audio-default-spice.args |   5 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |   5 +-
 tests/qemuxml2argvdata/autoindex.args         |   5 +-
 .../qemuxml2argvdata/balloon-device-auto.args |   5 +-
 .../balloon-device-deflate-off.args           |   5 +-
 .../balloon-device-deflate.args               |   5 +-
 .../balloon-device-period.args                |   5 +-
 tests/qemuxml2argvdata/balloon-device.args    |   5 +-
 tests/qemuxml2argvdata/blkiotune-device.args  |   5 +-
 tests/qemuxml2argvdata/blkiotune.args         |   5 +-
 tests/qemuxml2argvdata/boot-cdrom.args        |   5 +-
 tests/qemuxml2argvdata/boot-complex.args      |  35 +-
 tests/qemuxml2argvdata/boot-floppy-q35.args   |   6 +-
 tests/qemuxml2argvdata/boot-floppy.args       |  10 +-
 .../boot-menu-disable-drive.args              |   5 +-
 tests/qemuxml2argvdata/boot-menu-disable.args |   5 +-
 .../boot-menu-enable-with-timeout.args        |   5 +-
 tests/qemuxml2argvdata/boot-menu-enable.args  |   5 +-
 tests/qemuxml2argvdata/boot-multi.args        |   5 +-
 tests/qemuxml2argvdata/boot-network.args      |   5 +-
 tests/qemuxml2argvdata/boot-order.args        |  20 +-
 tests/qemuxml2argvdata/channel-guestfwd.args  |   5 +-
 tests/qemuxml2argvdata/channel-spicevmc.args  |   5 +-
 .../qemuxml2argvdata/channel-virtio-auto.args |   5 +-
 .../channel-virtio-autoadd.args               |   5 +-
 .../channel-virtio-autoassign.args            |   5 +-
 .../channel-virtio-default.args               |   5 +-
 .../channel-virtio-state.args                 |   5 +-
 .../qemuxml2argvdata/channel-virtio-unix.args |   5 +-
 tests/qemuxml2argvdata/channel-virtio.args    |   5 +-
 tests/qemuxml2argvdata/clock-catchup.args     |   5 +-
 tests/qemuxml2argvdata/clock-france.args      |   5 +-
 tests/qemuxml2argvdata/clock-hpet-off.args    |   5 +-
 .../clock-localtime-basis-localtime.args      |   5 +-
 tests/qemuxml2argvdata/clock-localtime.args   |   5 +-
 tests/qemuxml2argvdata/clock-realtime.args    |   5 +-
 tests/qemuxml2argvdata/clock-utc.args         |   5 +-
 tests/qemuxml2argvdata/clock-variable.args    |   5 +-
 .../qemuxml2argvdata/console-compat-auto.args |   5 +-
 .../console-compat-chardev.args               |   5 +-
 tests/qemuxml2argvdata/console-compat.args    |   5 +-
 .../qemuxml2argvdata/console-virtio-ccw.args  |   5 +-
 .../qemuxml2argvdata/console-virtio-many.args |   5 +-
 tests/qemuxml2argvdata/console-virtio.args    |   5 +-
 tests/qemuxml2argvdata/controller-order.args  |  10 +-
 .../cpu-host-passthrough-features.args        |   5 +-
 .../qemuxml2argvdata/cputune-zero-shares.args |   5 +-
 tests/qemuxml2argvdata/cputune.args           |   5 +-
 tests/qemuxml2argvdata/disk-nvme.xml          |   5 +-
 .../qemuxml2argvdata/encrypted-disk-usage.xml |   5 +-
 .../firmware-manual-efi-acpi-aarch64.args     |   8 +-
 .../firmware-manual-efi-acpi-q35.args         |   8 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |   8 +-
 .../firmware-manual-efi-secure.args           |   8 +-
 .../qemuxml2argvdata/firmware-manual-efi.args |   8 +-
 .../qemuxml2argvdata/graphics-dbus-audio.args |   5 +-
 .../graphics-egl-headless.args                |   5 +-
 .../graphics-sdl-fullscreen.args              |   5 +-
 tests/qemuxml2argvdata/graphics-sdl.args      |   5 +-
 .../hostdev-scsi-vhost-scsi-ccw.args          |   5 +-
 .../hostdev-scsi-vhost-scsi-pci.args          |   5 +-
 .../hostdev-vfio-multidomain.args             |   5 +-
 tests/qemuxml2argvdata/hostdev-vfio.args      |   5 +-
 .../qemuxml2argvdata/hugepages-memaccess.args |   5 +-
 .../hugepages-memaccess2.args                 |   5 +-
 tests/qemuxml2argvdata/hugepages-shared.args  |   5 +-
 .../hvf-aarch64-virt-headless.args            |  13 +-
 .../hvf-x86_64-q35-headless.args              |   5 +-
 .../qemuxml2argvdata/input-usbmouse-addr.args |   5 +-
 tests/qemuxml2argvdata/input-usbmouse.args    |   5 +-
 tests/qemuxml2argvdata/input-usbtablet.args   |   5 +-
 tests/qemuxml2argvdata/input-virtio-ccw.args  |   5 +-
 .../iothreads-disk-virtio-ccw.args            |  10 +-
 tests/qemuxml2argvdata/iothreads-disk.args    |  15 +-
 .../iothreads-ids-partial.args                |   5 +-
 tests/qemuxml2argvdata/iothreads-ids.args     |   5 +-
 tests/qemuxml2argvdata/iothreads.args         |   5 +-
 tests/qemuxml2argvdata/kvm-pit-delay.args     |   5 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args   |   5 +-
 .../machine-aeskeywrap-off-cap.args           |   5 +-
 .../machine-aeskeywrap-off-caps.args          |   5 +-
 .../machine-aeskeywrap-on-cap.args            |   5 +-
 .../machine-aeskeywrap-on-caps.args           |   5 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |   5 +-
 tests/qemuxml2argvdata/machine-aliases2.args  |   5 +-
 tests/qemuxml2argvdata/machine-core-off.args  |   5 +-
 tests/qemuxml2argvdata/machine-core-on.args   |   5 +-
 .../machine-deakeywrap-off-cap.args           |   5 +-
 .../machine-deakeywrap-off-caps.args          |   5 +-
 .../machine-deakeywrap-on-cap.args            |   5 +-
 .../machine-deakeywrap-on-caps.args           |   5 +-
 .../machine-keywrap-none-caps.args            |   5 +-
 .../machine-keywrap-none.args                 |   5 +-
 ...ine-loadparm-multiple-disks-nets-s390.args |  10 +-
 .../machine-loadparm-s390.args                |   5 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |   5 +-
 tests/qemuxml2argvdata/master-key.args        |   5 +-
 .../memory-hotplug-dimm-addr.args             |   5 +-
 .../qemuxml2argvdata/memory-hotplug-dimm.args |   5 +-
 tests/qemuxml2argvdata/memory-hotplug.args    |   5 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |   5 +-
 tests/qemuxml2argvdata/memtune.args           |   5 +-
 tests/qemuxml2argvdata/migrate.args           |   5 +-
 tests/qemuxml2argvdata/minimal.args           |   5 +-
 tests/qemuxml2argvdata/misc-acpi.args         |   5 +-
 tests/qemuxml2argvdata/misc-disable-s3.args   |   5 +-
 .../misc-disable-suspends.args                |   5 +-
 tests/qemuxml2argvdata/misc-enable-s4.args    |   5 +-
 tests/qemuxml2argvdata/misc-uuid.args         |   5 +-
 tests/qemuxml2argvdata/monitor-json.args      |   5 +-
 .../multifunction-pci-device.args             |   5 +-
 tests/qemuxml2argvdata/net-client.args        |   5 +-
 tests/qemuxml2argvdata/net-eth-hostip.args    |   5 +-
 tests/qemuxml2argvdata/net-eth-ifname.args    |   5 +-
 tests/qemuxml2argvdata/net-eth-names.args     |   5 +-
 .../net-eth-unmanaged-tap.args                |   5 +-
 tests/qemuxml2argvdata/net-eth.args           |   5 +-
 .../net-hostdev-bootorder.args                |   5 +-
 .../net-hostdev-multidomain.args              |   5 +-
 .../net-hostdev-vfio-multidomain.args         |   5 +-
 tests/qemuxml2argvdata/net-hostdev-vfio.args  |   5 +-
 tests/qemuxml2argvdata/net-hostdev.args       |   5 +-
 tests/qemuxml2argvdata/net-mcast.args         |   5 +-
 tests/qemuxml2argvdata/net-server.args        |   5 +-
 tests/qemuxml2argvdata/net-udp.args           |   5 +-
 tests/qemuxml2argvdata/net-user-addr.args     |   5 +-
 tests/qemuxml2argvdata/net-user.args          |   5 +-
 .../net-vhostuser-multiq.args                 |   5 +-
 tests/qemuxml2argvdata/net-virtio-device.args |   5 +-
 .../net-virtio-disable-offloads.args          |   5 +-
 tests/qemuxml2argvdata/net-virtio-netdev.args |   5 +-
 .../net-virtio-rxtxqueuesize.args             |   5 +-
 .../net-virtio-teaming-hostdev.args           |   5 +-
 .../qemuxml2argvdata/net-virtio-teaming.args  |   5 +-
 tests/qemuxml2argvdata/net-virtio.args        |   5 +-
 tests/qemuxml2argvdata/nosharepages.args      |   5 +-
 .../numad-auto-memory-vcpu-cpuset.args        |   5 +-
 ...o-memory-vcpu-no-cpuset-and-placement.args |   5 +-
 .../numad-auto-vcpu-static-numatune.args      |   5 +-
 .../numad-static-memory-auto-vcpu.args        |   5 +-
 tests/qemuxml2argvdata/numad.args             |   5 +-
 .../numatune-auto-nodeset-invalid.args        |   5 +-
 tests/qemuxml2argvdata/numatune-memory.args   |   5 +-
 .../parallel-parport-chardev.args             |   5 +-
 .../parallel-tcp-chardev.args                 |   5 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |   5 +-
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |   5 +-
 tests/qemuxml2argvdata/pci-autofill-addr.args |   5 +-
 .../pci-bridge-many-disks.args                | 525 ++++++++------
 tests/qemuxml2argvdata/pci-bridge.args        |   5 +-
 tests/qemuxml2argvdata/pci-many.args          | 145 ++--
 tests/qemuxml2argvdata/pci-rom.args           |   5 +-
 .../pci-serial-dev-chardev.args               |   5 +-
 tests/qemuxml2argvdata/pcie-expander-bus.args |   5 +-
 tests/qemuxml2argvdata/pcie-root-port.args    |   5 +-
 .../pcie-switch-downstream-port.args          |   5 +-
 .../pcie-switch-upstream-port.args            |   5 +-
 tests/qemuxml2argvdata/pcihole64-q35.args     |   5 +-
 .../pseries-vio-user-assigned.args            |   5 +-
 tests/qemuxml2argvdata/pseries-vio.args       |   5 +-
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |   5 +-
 tests/qemuxml2argvdata/q35-pcie.args          |   5 +-
 tests/qemuxml2argvdata/q35-usb2-multi.args    |   5 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |   5 +-
 tests/qemuxml2argvdata/q35-usb2.args          |   5 +-
 .../q35-virt-manager-basic.args               |   5 +-
 tests/qemuxml2argvdata/q35-virtio-pci.args    |   5 +-
 tests/qemuxml2argvdata/q35.args               |   5 +-
 tests/qemuxml2argvdata/qemu-ns-alt.args       |   5 +-
 .../qemu-ns-commandline-ns0.args              |   5 +-
 .../qemu-ns-commandline-ns1.args              |   5 +-
 .../qemuxml2argvdata/qemu-ns-commandline.args |   5 +-
 .../qemu-ns-domain-commandline-ns0.args       |   5 +-
 .../qemu-ns-domain-commandline.args           |   5 +-
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |   5 +-
 tests/qemuxml2argvdata/qemu-ns-no-env.args    |   5 +-
 tests/qemuxml2argvdata/restore-v2-fd.args     |   5 +-
 tests/qemuxml2argvdata/restore-v2.args        |   5 +-
 tests/qemuxml2argvdata/riscv64-virt-pci.args  |   5 +-
 tests/qemuxml2argvdata/riscv64-virt.args      |   5 +-
 tests/qemuxml2argvdata/seclabel-dac-none.args |   5 +-
 .../seclabel-dynamic-baselabel.args           |   5 +-
 .../seclabel-dynamic-labelskip.args           |   5 +-
 .../seclabel-dynamic-override.args            |  10 +-
 .../seclabel-dynamic-relabel.args             |   5 +-
 tests/qemuxml2argvdata/seclabel-dynamic.args  |   5 +-
 tests/qemuxml2argvdata/seclabel-none.args     |   5 +-
 .../seclabel-static-labelskip.args            |   5 +-
 .../seclabel-static-relabel.args              |   5 +-
 tests/qemuxml2argvdata/seclabel-static.args   |   5 +-
 .../serial-dev-chardev-iobase.args            |   5 +-
 .../qemuxml2argvdata/serial-dev-chardev.args  |   5 +-
 .../qemuxml2argvdata/serial-file-chardev.args |   5 +-
 tests/qemuxml2argvdata/serial-file-log.args   |   5 +-
 .../qemuxml2argvdata/serial-many-chardev.args |   5 +-
 .../qemuxml2argvdata/serial-pty-chardev.args  |   5 +-
 tests/qemuxml2argvdata/serial-spiceport.args  |   5 +-
 .../qemuxml2argvdata/serial-tcp-chardev.args  |   5 +-
 .../serial-tcp-telnet-chardev.args            |   5 +-
 .../serial-tcp-tlsx509-chardev-notls.args     |   5 +-
 .../serial-tcp-tlsx509-chardev-verify.args    |   5 +-
 .../serial-tcp-tlsx509-chardev.args           |   5 +-
 .../serial-tcp-tlsx509-secret-chardev.args    |   5 +-
 .../qemuxml2argvdata/serial-udp-chardev.args  |   5 +-
 tests/qemuxml2argvdata/serial-vc-chardev.args |   5 +-
 tests/qemuxml2argvdata/smbios-type-fwcfg.args |   5 +-
 tests/qemuxml2argvdata/smbios.args            |   5 +-
 tests/qemuxml2argvdata/smp-dies.args          |   5 +-
 tests/qemuxml2argvdata/smp.args               |   5 +-
 tests/qemuxml2argvdata/sound-device.args      |   5 +-
 tests/qemuxml2argvdata/sound.args             |   5 +-
 tests/qemuxml2argvdata/sparc-minimal.args     |  10 +-
 tests/qemuxml2argvdata/user-aliases-usb.args  |  41 --
 .../user-aliases-usb.x86_64-latest.args       |  44 ++
 tests/qemuxml2argvdata/user-aliases.args      |  68 --
 .../user-aliases.x86_64-latest.args           |  74 ++
 tests/qemuxml2argvdata/user-aliases.xml       |   5 +-
 tests/qemuxml2argvdata/user-aliases2.args     |   1 -
 .../user-aliases2.x86_64-latest.args          |  39 +
 .../video-device-pciaddr-default.args         |   5 +-
 tests/qemuxml2argvdata/video-none-device.args |   5 +-
 .../video-qxl-device-vgamem.args              |   5 +-
 tests/qemuxml2argvdata/video-qxl-device.args  |   5 +-
 tests/qemuxml2argvdata/video-qxl-heads.args   |   5 +-
 tests/qemuxml2argvdata/video-qxl-noheads.args |   5 +-
 .../video-qxl-resolution.args                 |   5 +-
 .../video-qxl-sec-device-vgamem.args          |   5 +-
 .../video-qxl-sec-device.args                 |   5 +-
 .../video-vga-device-vgamem.args              |   5 +-
 tests/qemuxml2argvdata/video-vga-device.args  |   5 +-
 .../qemuxml2argvdata/video-vga-qxl-heads.args |   5 +-
 .../video-virtio-gpu-ccw.args                 |   5 +-
 .../video-virtio-gpu-device.args              |   5 +-
 .../video-virtio-gpu-sdl-gl.args              |   5 +-
 .../video-virtio-gpu-spice-gl.args            |   5 +-
 .../video-virtio-gpu-virgl.args               |   5 +-
 tests/qemuxml2argvdata/video-virtio-vga.args  |   5 +-
 tests/qemuxml2argvdata/virtio-rng-ccw.args    |   5 +-
 tests/qemuxml2argvdata/vmcoreinfo.args        |   5 +-
 tests/qemuxml2argvtest.c                      |  14 +-
 ...k-nvme.xml => disk-nvme.x86_64-latest.xml} |   0
 ...=> encrypted-disk-usage.x86_64-latest.xml} |   0
 ...k.xml => encrypted-disk.x86_64-latest.xml} |   5 +-
 ...ses.xml => user-aliases.x86_64-latest.xml} |   0
 tests/qemuxml2xmltest.c                       |  15 +-
 358 files changed, 1924 insertions(+), 8440 deletions(-)
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
 delete mode 100644 tests/qemuxml2argvdata/user-aliases-usb.args
 create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/user-aliases.args
 create mode 100644 tests/qemuxml2argvdata/user-aliases.x86_64-latest.args
 delete mode 120000 tests/qemuxml2argvdata/user-aliases2.args
 create mode 100644 tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args
 rename tests/qemuxml2xmloutdata/{disk-nvme.xml => disk-nvme.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{encrypted-disk-usage.xml => encrypted-disk-usage.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{encrypted-disk.xml => encrypted-disk.x86_64-latest.xml} (89%)
 rename tests/qemuxml2xmloutdata/{user-aliases.xml => user-aliases.x86_64-latest.xml} (100%)

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:40 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:40 +0200
Subject: [PATCH 02/80] qemu: capabilities: Retire QEMU_CAPS_CHANGE_BACKING_FILE
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <75727db246dd82fdfc4deb24345a4012a4797de9.1658843187.git.pkrempa@redhat.com>

The 'change-backing-file' command is unconditionally supported since
qemu-2.1.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 7440bff111..2e99991740 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -299,7 +299,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               /* 165 */
               "msg-timestamp", /* X_QEMU_CAPS_MSG_TIMESTAMP */
               "active-commit", /* QEMU_CAPS_ACTIVE_COMMIT */
-              "change-backing-file", /* QEMU_CAPS_CHANGE_BACKING_FILE */
+              "change-backing-file", /* X_QEMU_CAPS_CHANGE_BACKING_FILE */
               "memory-backend-ram", /* QEMU_CAPS_OBJECT_MEMORY_RAM */
               "numa", /* QEMU_CAPS_NUMA */

@@ -1206,7 +1206,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-spice", QEMU_CAPS_SPICE },
     { "query-vnc", QEMU_CAPS_VNC },
     { "nbd-server-start", QEMU_CAPS_NBD_SERVER },
-    { "change-backing-file", QEMU_CAPS_CHANGE_BACKING_FILE },
     { "rtc-reset-reinjection", QEMU_CAPS_RTC_RESET_REINJECTION },
     { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
     { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index b49aa0dea6..7b4e85421c 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -277,7 +277,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     /* 165 */
     X_QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */
     QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
-    QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
+    X_QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
     QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */
     QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index d2821bb67f..3ec3b21ef5 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index e7316547e2..f32701da9b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 8ed3d05316..e093ff8139 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -28,7 +28,6 @@
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 5f44c61b4c..ae30737018 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c7a897c8ba..fcfbadb0db 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -51,7 +51,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 500cd24797..429bfdbfcc 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -49,7 +49,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index fe7f570776..8e713d7ef7 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -52,7 +52,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index f21a139333..b028d5da94 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 0242203347..bc30d481fe 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -19,7 +19,6 @@
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 0adfa31c03..a5fd140d3e 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 207775c9e3..1077a9889f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -50,7 +50,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 825a848d17..6a099f8798 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 4dc145ac18..5dc1aa06f1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -51,7 +51,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index a901c70613..a8388379bf 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -27,7 +27,6 @@
   <flag name='vfio-pci'/>
   <flag name='drive-discard'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 8b883cb612..713ba5f080 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index c4b505b263..52b994a738 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 4203b672a1..bde1687064 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -27,7 +27,6 @@
   <flag name='vfio-pci'/>
   <flag name='drive-discard'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 407bd48e1b..4feeda8551 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 734fdd789c..f954fd784a 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 9e23720e4b..2d0a19b121 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -54,7 +54,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 3493d3d0a3..d0abf1ef27 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index d8ac2cfac6..2c69cd23bf 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 91de7cd9f0..159f48d0b0 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -54,7 +54,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 37b59ce6ac..a2c48366f7 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -54,7 +54,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 9531c5b909..c4b68f4058 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 7646569ff8..579d220a95 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
   <flag name='active-commit'/>
-  <flag name='change-backing-file'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:41 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:41 +0200
Subject: [PATCH 03/80] qemu: Always assume support for QEMU_CAPS_ACTIVE_COMMIT
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <909c248da8064d80c821b0339b1275a6cf716b5f.1658843187.git.pkrempa@redhat.com>

Active layer block commit is unconditionally supported since qemu-2.0.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 15742706fc..cfb02f7b0f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15637,11 +15637,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
         goto endjob;

     if (topSource == disk->src) {
-        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_ACTIVE_COMMIT)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("active commit not supported with this QEMU binary"));
-            goto endjob;
-        }
         /* XXX Should we auto-pivot when COMMIT_ACTIVE is not specified? */
         if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_ACTIVE)) {
             virReportError(VIR_ERR_INVALID_ARG,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:39 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:39 +0200
Subject: [PATCH 01/80] qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <8a586914a7580f5f230ed3528c20d9b73da48464.1658843187.git.pkrempa@redhat.com>

The 'change-backing-file' command was added in qemu-2.1 and doesn't have
any dependancies. We use it as witness for using blockjobs with relative
backing paths. Always assume it's support.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9013e6fb8d..15742706fc 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14557,13 +14557,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm,

     if (baseSource) {
         if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) {
-            if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("this QEMU binary doesn't support relative "
-                                 "block pull/rebase"));
-                goto endjob;
-            }
-
             if (blockdev &&
                 qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
                 goto endjob;
@@ -15697,12 +15690,6 @@ qemuDomainBlockCommit(virDomainPtr dom,

     if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE &&
         topSource != disk->src) {
-        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CHANGE_BACKING_FILE)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("this qemu doesn't support relative block commit"));
-            goto endjob;
-        }
-
         if (blockdev && top_parent &&
             qemuBlockUpdateRelativeBacking(vm, top_parent, disk->src) < 0)
             goto endjob;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:42 +0200
Subject: [PATCH 04/80] qemu: capabilities: Retire QEMU_CAPS_ACTIVE_COMMIT
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <41eeb75b59d3c1ed8ca27d63b5e27657b6f765b5.1658843187.git.pkrempa@redhat.com>

Active block commit is supported since qemu-2.0

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2e99991740..97c2268f57 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -298,7 +298,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 165 */
               "msg-timestamp", /* X_QEMU_CAPS_MSG_TIMESTAMP */
-              "active-commit", /* QEMU_CAPS_ACTIVE_COMMIT */
+              "active-commit", /* X_QEMU_CAPS_ACTIVE_COMMIT */
               "change-backing-file", /* X_QEMU_CAPS_CHANGE_BACKING_FILE */
               "memory-backend-ram", /* QEMU_CAPS_OBJECT_MEMORY_RAM */
               "numa", /* QEMU_CAPS_NUMA */
@@ -1584,7 +1584,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =

 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-    { "block-commit/arg-type/*top",  QEMU_CAPS_ACTIVE_COMMIT },
     { "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},
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7b4e85421c..fcb6277538 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -276,7 +276,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 165 */
     X_QEMU_CAPS_MSG_TIMESTAMP, /* -msg timestamp */
-    QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
+    X_QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */
     X_QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */
     QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */
     QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 3ec3b21ef5..79bf3d3363 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -48,7 +48,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index f32701da9b..895c8b2491 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -47,7 +47,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index e093ff8139..2b8bf907c5 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -27,7 +27,6 @@
   <flag name='vfio-pci'/>
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index ae30737018..4c91ed53a6 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index fcfbadb0db..25a3c05fb4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -50,7 +50,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 429bfdbfcc..a6faf3a753 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -48,7 +48,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 8e713d7ef7..945faf25a1 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -51,7 +51,6 @@
   <flag name='ich9-intel-hda'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index b028d5da94..50b2dda15c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index bc30d481fe..98661d651d 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -18,7 +18,6 @@
   <flag name='rng-egd'/>
   <flag name='drive-discard'/>
   <flag name='enable-fips'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a5fd140d3e..b593c23e6b 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='pvpanic'/>
   <flag name='enable-fips'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 1077a9889f..6a0eac1128 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 6a099f8798..76ce9e6f5e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -47,7 +47,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 5dc1aa06f1..ceb2eef871 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -50,7 +50,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index a8388379bf..bc635ea64a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -26,7 +26,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='drive-discard'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 713ba5f080..0564c3e79a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -62,7 +62,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 52b994a738..4c10416fca 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -48,7 +48,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index bde1687064..67e1a3ec1f 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -26,7 +26,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='drive-discard'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 4feeda8551..a9b62a310a 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index f954fd784a..b5814f23a9 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 2d0a19b121..24a24fc046 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -53,7 +53,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index d0abf1ef27..6d70213b81 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -47,7 +47,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 2c69cd23bf..b3448ad18d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 159f48d0b0..126197ecf2 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -53,7 +53,6 @@
   <flag name='virtio-mmio'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index a2c48366f7..4040dbd7f3 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -53,7 +53,6 @@
   <flag name='usb-storage.removable'/>
   <flag name='ich9-intel-hda'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index c4b68f4058..fa10562609 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 579d220a95..29bc0c15f9 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -61,7 +61,6 @@
   <flag name='kvm-pit-lost-tick-policy'/>
   <flag name='pvpanic'/>
   <flag name='usb-kbd'/>
-  <flag name='active-commit'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:43 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:43 +0200
Subject: [PATCH 05/80] qemu: Always assume support for
 QEMU_CAPS_GLUSTER_DEBUG_LEVEL
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <5f5b0a65df6c8a7ae750aa14da8e11e6a50b52f3.1658843187.git.pkrempa@redhat.com>

The 'debug' level for the gluster driver was added in qemu-2.8
unconditionally so libvirt can always assume it.

Signed-off-by: Peter Krempa <pkrempa at 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 7df8041adf..534de9e0ae 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7667,22 +7667,19 @@ qemuDomainStorageSourceValidateDepth(virStorageSource *src,
  * qemuDomainPrepareStorageSourceConfig:
  * @src: storage source to configure
  * @cfg: qemu driver config object
- * @qemuCaps: capabilities of qemu
  *
  * Set properties of @src based on the qemu driver config @cfg.
  *
  */
 static void
 qemuDomainPrepareStorageSourceConfig(virStorageSource *src,
-                                     virQEMUDriverConfig *cfg,
-                                     virQEMUCaps *qemuCaps)
+                                     virQEMUDriverConfig *cfg)
 {
     if (!cfg)
         return;

     if (src->type == VIR_STORAGE_TYPE_NETWORK &&
-        src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) {
+        src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER) {
         src->debug = true;
         src->debugLevel = cfg->glusterDebugLevel;
     }
@@ -7802,7 +7799,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
         if (qemuDomainValidateStorageSource(n, priv->qemuCaps, isSD) < 0)
             return -1;

-        qemuDomainPrepareStorageSourceConfig(n, cfg, priv->qemuCaps);
+        qemuDomainPrepareStorageSourceConfig(n, cfg);
         qemuDomainPrepareDiskSourceData(disk, n);

         if (blockdev && !isSD &&
@@ -10864,7 +10861,7 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef *disk,
     if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) < 0)
         return -1;

-    qemuDomainPrepareStorageSourceConfig(disk->src, cfg, priv->qemuCaps);
+    qemuDomainPrepareStorageSourceConfig(disk->src, cfg);
     qemuDomainPrepareDiskSourceData(disk, disk->src);

     if (qemuDomainSecretStorageSourcePrepare(priv, disk->src,
@@ -10902,7 +10899,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef *disk,
     if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0)
         return -1;

-    qemuDomainPrepareStorageSourceConfig(src, cfg, priv->qemuCaps);
+    qemuDomainPrepareStorageSourceConfig(src, cfg);
     qemuDomainPrepareDiskSourceData(disk, src);

     if (qemuDomainSecretStorageSourcePrepare(priv, src,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:45 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:45 +0200
Subject: [PATCH 07/80] qemu: Always assume support for QEMU_CAPS_DRIVE_DISCARD
 and QEMU_CAPS_DRIVE_DETECT_ZEROES
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <3679c698e08570034e7eb10940fa5f42d9c4db15.1658843187.git.pkrempa@redhat.com>

Discard and zero-detection for disk sources is supported since qemu-2.1
so we can always assume it's support.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_validate.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 1b23f1a2ca..b949e1aa42 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -3069,20 +3069,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk,
         return -1;
     }

-    if (disk->discard &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DISCARD)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("discard is not supported by this QEMU binary"));
-        return -1;
-    }
-
-    if (disk->detect_zeroes &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DRIVE_DETECT_ZEROES)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("detect_zeroes is not supported by this QEMU binary"));
-        return -1;
-    }
-
     if (disk->serial &&
         qemuValidateDomainDeviceDefDiskSerial(disk->serial) < 0)
         return -1;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:46 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:46 +0200
Subject: [PATCH 08/80] qemu: capabilities: Retire QEMU_CAPS_DRIVE_DISCARD and
 QEMU_CAPS_DRIVE_DETECT_ZEROES
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <2a9c5ebdbf9d2336c894080d090a3f7bfa0cd6cc.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 6 ++----
 src/qemu/qemu_capabilities.h                      | 4 ++--
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 2 --
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 2 --
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 2 --
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 2 --
 28 files changed, 4 insertions(+), 58 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index cb47da9b1a..a01de90c29 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -270,7 +270,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 145 */
               "vnc-websocket", /* X_QEMU_CAPS_VNC_WEBSOCKET */
-              "drive-discard", /* QEMU_CAPS_DRIVE_DISCARD */
+              "drive-discard", /* X_QEMU_CAPS_DRIVE_DISCARD */
               "mlock", /* X_QEMU_CAPS_REALTIME_MLOCK */
               "vnc-share-policy", /* X_QEMU_CAPS_VNC_SHARE_POLICY */
               "device-del-event", /* X_QEMU_CAPS_DEVICE_DEL_EVENT */
@@ -382,7 +382,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 225 */
               "spice-unix", /* X_QEMU_CAPS_SPICE_UNIX */
-              "drive-detect-zeroes", /* QEMU_CAPS_DRIVE_DETECT_ZEROES */
+              "drive-detect-zeroes", /* X_QEMU_CAPS_DRIVE_DETECT_ZEROES */
               "tls-creds-x509", /* X_QEMU_CAPS_OBJECT_TLS_CREDS_X509 */
               "display", /* X_QEMU_CAPS_DISPLAY */
               "intel-iommu", /* QEMU_CAPS_DEVICE_INTEL_IOMMU */
@@ -1591,8 +1591,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
     { "blockdev-add/arg-type/+file/aio/^io_uring", QEMU_CAPS_AIO_IO_URING },
     { "blockdev-add/arg-type/+rbd/encrypt", QEMU_CAPS_RBD_ENCRYPTION },
-    { "blockdev-add/arg-type/discard", QEMU_CAPS_DRIVE_DISCARD },
-    { "blockdev-add/arg-type/detect-zeroes", QEMU_CAPS_DRIVE_DETECT_ZEROES },
     { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME },
     { "blockdev-backup", QEMU_CAPS_BLOCKDEV_BACKUP },
     { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5a258d9bf4..cfa916c846 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -248,7 +248,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 145 */
     X_QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
-    QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
+    X_QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */
     X_QEMU_CAPS_REALTIME_MLOCK, /* -realtime mlock=on|off */
     X_QEMU_CAPS_VNC_SHARE_POLICY, /* set display sharing policy */
     X_QEMU_CAPS_DEVICE_DEL_EVENT, /* DEVICE_DELETED event */
@@ -361,7 +361,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 225 */
     X_QEMU_CAPS_SPICE_UNIX, /* -spice unix */
-    QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
+    X_QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
     X_QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
     X_QEMU_CAPS_DISPLAY, /* -display */
     QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 3184b54dfb..9dfe93ef45 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -40,7 +40,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -79,7 +78,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 0d1d7d709f..120e7221a3 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -40,7 +40,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -75,7 +74,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 0d0878f911..9bafdc08ff 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -25,7 +25,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
@@ -46,7 +45,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index fd68a0a068..2cb38642e7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 7da83d5437..e5fcc07d14 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -42,7 +42,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 9cf5648e51..8834e745dc 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -76,7 +75,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 97e0b95eeb..841e935438 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -43,7 +43,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index f80ea261aa..89ed03e279 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 4ba06b3cb7..551c4dcb79 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -16,7 +16,6 @@
   <flag name='nbd-server'/>
   <flag name='rng-random'/>
   <flag name='rng-egd'/>
-  <flag name='drive-discard'/>
   <flag name='enable-fips'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
@@ -27,7 +26,6 @@
   <flag name='vserport-change-event'/>
   <flag name='spice-gl'/>
   <flag name='chardev-logfile'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='spice-rendernode'/>
   <flag name='block-write-threshold'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index d580800664..e5d4b355b1 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index a79b5f75eb..3b30fae3b7 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -42,7 +42,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -80,7 +79,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 9b2e7cbed4..f0a1c6d424 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -75,7 +74,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index a9c3501108..4b3a7e4e0b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -43,7 +43,6 @@
   <flag name='megasas'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -80,7 +79,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 21737b1d50..62b6bc6e77 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -25,7 +25,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
@@ -45,7 +44,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 75370d1afe..2f1dbec6dc 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -51,7 +51,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -101,7 +100,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 799e77cb79..6ab242ef09 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -41,7 +41,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 3c31cffa80..4b30f544e8 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -25,7 +25,6 @@
   <flag name='virtio-ccw'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='memory-backend-ram'/>
   <flag name='numa'/>
   <flag name='memory-backend-file'/>
@@ -45,7 +44,6 @@
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='chardev-logfile'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 1b59879e0f..935148a8a1 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -100,7 +99,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 25ccf44776..c4ae311be8 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 8cede64f5b..870cf154f1 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -46,7 +46,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -87,7 +86,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index f74f1f3d73..a904dea43a 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -41,7 +41,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -75,7 +74,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index b1846bc64e..fecb2cb03f 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index b7af87d6d7..5a47530d26 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -46,7 +46,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -87,7 +86,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 5da35e4a61..46db0d7832 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -47,7 +47,6 @@
   <flag name='nvram'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='usb-storage'/>
   <flag name='usb-storage.removable'/>
@@ -81,7 +80,6 @@
   <flag name='chardev-logfile'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 7c7a08e6ee..99b4d860f9 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index d33336922d..06e1afe692 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -50,7 +50,6 @@
   <flag name='tpm-tis'/>
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
-  <flag name='drive-discard'/>
   <flag name='dmi-to-pci-bridge'/>
   <flag name='i440fx-pci-hole64-size'/>
   <flag name='q35-pci-hole64-size'/>
@@ -99,7 +98,6 @@
   <flag name='pxb-pcie'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='drive-detect-zeroes'/>
   <flag name='intel-iommu'/>
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:44 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:44 +0200
Subject: [PATCH 06/80] qemu: capabilities: Retire QEMU_CAPS_GLUSTER_DEBUG_LEVEL
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <9f5f9379db3488798e49da0c20cafe8a78a2509e.1658843187.git.pkrempa@redhat.com>

The debug level of gluster backend became configurable in qemu-2.8.

This also removes the only old-style syntax for the 'blockdev-add'
command prior to stabilization.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 4 +---
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 97c2268f57..cb47da9b1a 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -402,7 +402,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "query-qmp-schema", /* X_QEMU_CAPS_QUERY_QMP_SCHEMA */

               /* 240 */
-              "gluster.debug_level", /* QEMU_CAPS_GLUSTER_DEBUG_LEVEL */
+              "gluster.debug_level", /* X_QEMU_CAPS_GLUSTER_DEBUG_LEVEL */
               "vhost-scsi", /* QEMU_CAPS_DEVICE_VHOST_SCSI */
               "drive-iotune-group", /* X_QEMU_CAPS_DRIVE_IOTUNE_GROUP */
               "query-cpu-model-expansion", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION */
@@ -1584,8 +1584,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =

 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-    { "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},
     { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS },
     { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index fcb6277538..5a258d9bf4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -381,7 +381,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_QUERY_QMP_SCHEMA, /* query-qmp-schema command */

     /* 240 */
-    QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
+    X_QEMU_CAPS_GLUSTER_DEBUG_LEVEL, /* -drive gluster.debug_level={0..9} */
     QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */
     X_QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */
     QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 79bf3d3363..3184b54dfb 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -85,7 +85,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 895c8b2491..0d1d7d709f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -82,7 +82,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='pcie-root-port'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 2b8bf907c5..0d0878f911 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -50,7 +50,6 @@
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 4c91ed53a6..fd68a0a068 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -109,7 +109,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 25a3c05fb4..7da83d5437 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -87,7 +87,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index a6faf3a753..9cf5648e51 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -83,7 +83,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 945faf25a1..97e0b95eeb 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -87,7 +87,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 50b2dda15c..f80ea261aa 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -109,7 +109,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 98661d651d..4ba06b3cb7 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -29,7 +29,6 @@
   <flag name='chardev-logfile'/>
   <flag name='drive-detect-zeroes'/>
   <flag name='query-hotpluggable-cpus'/>
-  <flag name='gluster.debug_level'/>
   <flag name='spice-rendernode'/>
   <flag name='block-write-threshold'/>
   <flag name='query-named-block-nodes'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index b593c23e6b..d580800664 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -109,7 +109,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 6a0eac1128..a79b5f75eb 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -86,7 +86,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 76ce9e6f5e..9b2e7cbed4 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -82,7 +82,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index ceb2eef871..a9c3501108 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -86,7 +86,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='spice-rendernode'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index bc635ea64a..21737b1d50 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 0564c3e79a..75370d1afe 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -109,7 +109,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 4c10416fca..799e77cb79 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -87,7 +87,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 67e1a3ec1f..3c31cffa80 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -49,7 +49,6 @@
   <flag name='virtio-pci-disable-legacy'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='virtio-net.rx_queue_size'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index a9b62a310a..1b59879e0f 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -108,7 +108,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index b5814f23a9..25ccf44776 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -107,7 +107,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 24a24fc046..8cede64f5b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -93,7 +93,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 6d70213b81..f74f1f3d73 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -82,7 +82,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index b3448ad18d..b1846bc64e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -107,7 +107,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 126197ecf2..b7af87d6d7 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -93,7 +93,6 @@
   <flag name='virtio-net.rx_queue_size'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 4040dbd7f3..5da35e4a61 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -88,7 +88,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='nvdimm'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index fa10562609..7c7a08e6ee 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -107,7 +107,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 29bc0c15f9..d33336922d 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -107,7 +107,6 @@
   <flag name='virtio-vga'/>
   <flag name='ivshmem-plain'/>
   <flag name='ivshmem-doorbell'/>
-  <flag name='gluster.debug_level'/>
   <flag name='vhost-scsi'/>
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:48 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:48 +0200
Subject: [PATCH 10/80] qemuxml2xmltest: Modernize all test cases using
 QEMU_CAPS_QCOW2_LUKS
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f8f409008e5d92a0aa66ebd1d4773a6928fd3841.1658843187.git.pkrempa@redhat.com>

Modernize 'disk-nvme', 'encrypted-disk-usage', 'encrypted-disk', and
'user-aliases' cases to use DO_TEST_CAPS_LATEST.

This will remove all uses of QEMU_CAPS_QCOW2_LUKS from the test suite.

Since the output files are done via symlinks to input files, the input
files need to be modernized with few auto-added XML bits.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuxml2argvdata/disk-nvme.xml              |  5 ++++-
 tests/qemuxml2argvdata/encrypted-disk-usage.xml   |  5 ++++-
 tests/qemuxml2argvdata/user-aliases.xml           |  5 +++--
 ...{disk-nvme.xml => disk-nvme.x86_64-latest.xml} |  0
 ...xml => encrypted-disk-usage.x86_64-latest.xml} |  0
 ...-disk.xml => encrypted-disk.x86_64-latest.xml} |  5 ++++-
 ...aliases.xml => user-aliases.x86_64-latest.xml} |  0
 tests/qemuxml2xmltest.c                           | 15 ++++-----------
 8 files changed, 19 insertions(+), 16 deletions(-)
 rename tests/qemuxml2xmloutdata/{disk-nvme.xml => disk-nvme.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{encrypted-disk-usage.xml => encrypted-disk-usage.x86_64-latest.xml} (100%)
 rename tests/qemuxml2xmloutdata/{encrypted-disk.xml => encrypted-disk.x86_64-latest.xml} (89%)
 rename tests/qemuxml2xmloutdata/{user-aliases.xml => user-aliases.x86_64-latest.xml} (100%)

diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxml2argvdata/disk-nvme.xml
index 226ea3d686..5e521ad6d3 100644
--- a/tests/qemuxml2argvdata/disk-nvme.xml
+++ b/tests/qemuxml2argvdata/disk-nvme.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -49,7 +52,7 @@
       <target dev='vdd' bus='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <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'/>
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
index 43afacf220..7c5781b96f 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       </encryption>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <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'/>
diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml
index b688b84b56..9998c1e08f 100644
--- a/tests/qemuxml2argvdata/user-aliases.xml
+++ b/tests/qemuxml2argvdata/user-aliases.xml
@@ -19,7 +19,8 @@
     <apic/>
     <pae/>
   </features>
-  <cpu>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
     <numa>
       <cell id='0' cpus='0' memory='1048576' unit='KiB'/>
       <cell id='1' cpus='1' memory='1048576' unit='KiB'/>
@@ -70,7 +71,7 @@
       <alias name='ua-WhatAnAwesomeCDROM'/>
       <address type='drive' controller='0' bus='1' target='0' unit='0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <controller type='usb' index='0' model='piix3-uhci'>
       <alias name='ua-SomeWeirdController'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
     </controller>
diff --git a/tests/qemuxml2xmloutdata/disk-nvme.xml b/tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/disk-nvme.xml
rename to tests/qemuxml2xmloutdata/disk-nvme.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk-usage.xml b/tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/encrypted-disk-usage.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk-usage.x86_64-latest.xml
diff --git a/tests/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
similarity index 89%
rename from tests/qemuxml2xmloutdata/encrypted-disk.xml
rename to tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
index b840f35fa7..abf0bf59fe 100644
--- a/tests/qemuxml2xmloutdata/encrypted-disk.xml
+++ b/tests/qemuxml2xmloutdata/encrypted-disk.x86_64-latest.xml
@@ -8,6 +8,9 @@
     <type arch='x86_64' machine='pc'>hvm</type>
     <boot dev='hd'/>
   </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -23,7 +26,7 @@
       </encryption>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </disk>
-    <controller type='usb' index='0'>
+    <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'/>
diff --git a/tests/qemuxml2xmloutdata/user-aliases.xml b/tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml
similarity index 100%
rename from tests/qemuxml2xmloutdata/user-aliases.xml
rename to tests/qemuxml2xmloutdata/user-aliases.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index da0f6eabb7..6bf2ed8d30 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -349,7 +349,7 @@ mymain(void)
     DO_TEST_NOCAPS("disk-network-tlsx509-nbd");
     DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
     DO_TEST_NOCAPS("disk-network-tlsx509-vxhs");
-    DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS);
+    DO_TEST_CAPS_LATEST("disk-nvme");
     DO_TEST_CAPS_LATEST("disk-vhostuser");
     DO_TEST_CAPS_LATEST("disk-scsi");
     DO_TEST("disk-virtio-scsi-reservations",
@@ -570,8 +570,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST("disk-slices");
     DO_TEST_CAPS_LATEST("disk-rotation");

-    DO_TEST("encrypted-disk", QEMU_CAPS_QCOW2_LUKS);
-    DO_TEST("encrypted-disk-usage", QEMU_CAPS_QCOW2_LUKS);
+    DO_TEST_CAPS_LATEST("encrypted-disk");
+    DO_TEST_CAPS_LATEST("encrypted-disk-usage");
     DO_TEST_CAPS_LATEST("luks-disks");
     DO_TEST_CAPS_LATEST("luks-disks-source");
     DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
@@ -1293,14 +1293,7 @@ mymain(void)
     DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-compat", "ppc64");
     DO_TEST_CAPS_ARCH_LATEST("pseries-cpu-exact", "ppc64");

-    DO_TEST("user-aliases",
-            QEMU_CAPS_DEVICE_CIRRUS_VGA,
-            QEMU_CAPS_QCOW2_LUKS,
-            QEMU_CAPS_OBJECT_MEMORY_FILE,
-            QEMU_CAPS_PIIX_DISABLE_S3,
-            QEMU_CAPS_PIIX_DISABLE_S4,
-            QEMU_CAPS_VNC,
-            QEMU_CAPS_CCID_EMULATED);
+    DO_TEST_CAPS_LATEST("user-aliases");
     DO_TEST("input-virtio-ccw",
             QEMU_CAPS_CCW,
             QEMU_CAPS_VIRTIO_KEYBOARD,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:49 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:49 +0200
Subject: [PATCH 11/80] qemu: Always assume support for QEMU_CAPS_QCOW2_LUKS
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <45525b7510894d9eed275948ad5c408de9cb4b84.1658843187.git.pkrempa@redhat.com>

luks-encrypted QCOW2 files were introduced in qemu-2.6 unconditionally.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 534de9e0ae..245cae9c60 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5079,14 +5079,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
                                         src->encryption->engine);
                 return -1;
         }
-
-        if (src->format == VIR_STORAGE_FILE_QCOW2 &&
-            src->encryption->format == VIR_STORAGE_ENCRYPTION_FORMAT_LUKS &&
-            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QCOW2_LUKS)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("LUKS encrypted QCOW2 images are not supported by this QEMU"));
-            return -1;
-        }
     }

     if (src->tlsHostname) {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:51 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:51 +0200
Subject: [PATCH 13/80] qemu: capabilities: Unconditionally set
 QEMU_CAPS_BLOCKDEV/QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <2283db08421c27ff6392fc8729cdad4df8d01d54.1658843187.git.pkrempa@redhat.com>

The cleanup of the code to always assume support for QEMU_CAPS_BLOCKDEV
will not be simple, so for now we hardcode the support and the code will
be cleaned up gradually.

We also disallow users to clear the flags via the namespace property or
qemu.conf configuration.

The change to the PPC64 test data originatest from the fact that the
capability dump is not from the release version but is lacking one of
the necessary flags to enable -blockdev.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                   | 18 +++++-------------
 src/qemu/qemu_process.c                        | 12 ++++++++++++
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml      |  2 +-
 .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml  |  3 +++
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index e8b7d91062..9cffb07b9d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5228,6 +5228,11 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
 static void
 virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
 {
+    /* While the removal of pre-blockdev code is in progress we always hard-code
+     * the support for QEMU_CAPS_BLOCKDEV */
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV);
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);
+
     /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
      * should be built with gcrypt to achieve FIPS compliance
      * automatically / implicitly
@@ -5247,17 +5252,11 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
 void
 virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
 {
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
-        virQEMUCapsClear(qemuCaps, QEMU_CAPS_BLOCKDEV_BACKUP);
-
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_BACKUP) &&
         virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) &&
         virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);
-
     /* The -compat qemu command line argument is implemented using a newer
      * method which doesn't show up in query-command-line-options. As we'll use
      * it only for development and testing purposes we can base the capability
@@ -5302,13 +5301,6 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_UNAVAILABLE_FEATURES))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_CANONICAL_CPU_FEATURES);

-    /* To avoid guest ABI regression, blockdev shall be enabled only when
-     * we are able to pass the custom 'device_id' for SCSI disks and cdroms. */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_DEVICE_ID) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_SAVEVM_MONITOR_NODES))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV);
-
     /* We can't probe "esp" as a type via virQEMUCapsObjectTypes
      * array as it is only usable when builtin to the machine type
      */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d42333195a..438c903578 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5644,6 +5644,12 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
                 return -1;
             }

+            /* The code is being cleaned up to always assume the support for
+             * -blockdev thus we must no longer allow users to clear it */
+            if (tmp == QEMU_CAPS_BLOCKDEV ||
+                tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
+                continue;
+
             virQEMUCapsClear(priv->qemuCaps, tmp);
         }
     }
@@ -5668,6 +5674,12 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
                 return -1;
             }

+            /* The code is being cleaned up to always assume the support for
+             * -blockdev thus we must no longer allow users to clear it */
+            if (tmp == QEMU_CAPS_BLOCKDEV ||
+                tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
+                continue;
+
             virQEMUCapsClear(priv->qemuCaps, tmp);
         }
     }
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 4c3a2c6d98..7d3dd3c917 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -138,7 +138,7 @@
     <gic supported='no'/>
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
-    <backingStoreInput supported='no'/>
+    <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
   </features>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index cbdc1dd09a..702f6551a4 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -112,6 +112,7 @@
   <flag name='machine.pseries.cap-htm'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
+  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
@@ -140,11 +141,13 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='spapr-tpm-proxy'/>
+  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
+  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:50 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:50 +0200
Subject: [PATCH 12/80] qemu: capabilities: Retire QEMU_CAPS_QCOW2_LUKS
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <de116c8e77db6b3aee9504195332e0e40dbe3779.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a01de90c29..e8b7d91062 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -465,7 +465,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "virtio-tablet-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW */

               /* 285 */
-              "qcow2-luks", /* QEMU_CAPS_QCOW2_LUKS */
+              "qcow2-luks", /* X_QEMU_CAPS_QCOW2_LUKS */
               "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */
               "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */
               "query-cpus-fast", /* QEMU_CAPS_QUERY_CPUS_FAST */
@@ -1585,7 +1585,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =
 /* see documentation for virQEMUQAPISchemaPathGet for the query format */
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
-    { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS },
     { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
     { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index cfa916c846..7c5df0554b 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -444,7 +444,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW, /* -device virtio-tablet-ccw */

     /* 285 */
-    QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
+    X_QEMU_CAPS_QCOW2_LUKS, /* qcow2 format support LUKS encryption */
     QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */
     X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */
     QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 9dfe93ef45..c801c11391 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -99,7 +99,6 @@
   <flag name='disk-share-rw'/>
   <flag name='pl011'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 120e7221a3..cbdc1dd09a 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -97,7 +97,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 9bafdc08ff..290a663904 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -66,7 +66,6 @@
   <flag name='virtio-keyboard-ccw'/>
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
-  <flag name='qcow2-luks'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 2cb38642e7..a2e36da5bf 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -130,7 +130,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index e5fcc07d14..ba0be2518e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -101,7 +101,6 @@
   <flag name='disk-share-rw'/>
   <flag name='pl011'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 8834e745dc..15c4beea98 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -99,7 +99,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 841e935438..9d24daa1a9 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -98,7 +98,6 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='disk-share-rw'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 89ed03e279..18970c1f90 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -130,7 +130,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 551c4dcb79..6052009362 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -34,7 +34,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index e5d4b355b1..630d69d8ff 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -129,7 +129,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 3b30fae3b7..182694aca5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -100,7 +100,6 @@
   <flag name='disk-share-rw'/>
   <flag name='pl011'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index f0a1c6d424..14f648efd6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -97,7 +97,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 4b3a7e4e0b..09998c9564 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -96,7 +96,6 @@
   <flag name='virtio-blk.num-queues'/>
   <flag name='disk-share-rw'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 62b6bc6e77..9c24f45f69 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -64,7 +64,6 @@
   <flag name='virtio-keyboard-ccw'/>
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
-  <flag name='qcow2-luks'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 2f1dbec6dc..25cbeaacf0 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -129,7 +129,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 6ab242ef09..4e386dd29a 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -101,7 +101,6 @@
   <flag name='disk-share-rw'/>
   <flag name='pl011'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 4b30f544e8..66763ef480 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -64,7 +64,6 @@
   <flag name='virtio-keyboard-ccw'/>
   <flag name='virtio-mouse-ccw'/>
   <flag name='virtio-tablet-ccw'/>
-  <flag name='qcow2-luks'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
   <flag name='nbd-tls'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 935148a8a1..b4f31cdebd 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -128,7 +128,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index c4ae311be8..67e68ce7c8 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -127,7 +127,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 870cf154f1..20ba835984 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -108,7 +108,6 @@
   <flag name='disk-share-rw'/>
   <flag name='pl011'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index a904dea43a..2d1ca291a9 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -97,7 +97,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index fecb2cb03f..7dc962f9c4 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -127,7 +127,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 5a47530d26..7627b5b03c 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -108,7 +108,6 @@
   <flag name='disk-share-rw'/>
   <flag name='pl011'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 46db0d7832..5710c609f9 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -103,7 +103,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 99b4d860f9..8c5aea8aa5 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -127,7 +127,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 06e1afe692..84c598a286 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -127,7 +127,6 @@
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
   <flag name='dump-completed'/>
-  <flag name='qcow2-luks'/>
   <flag name='pcie-pci-bridge'/>
   <flag name='query-cpus-fast'/>
   <flag name='disk-write-cache'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:47 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:47 +0200
Subject: [PATCH 09/80] qemuxml2argvtest: Use DO_TEST_CAPS_LATEST for all
 'user-aliases' tests
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <5167ec4042f0dc1194808540d91726920fbd0664.1658843187.git.pkrempa@redhat.com>

Modernize the tests as they mostly care that the aliases are properly
propagated to qemu.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuxml2argvdata/user-aliases-usb.args  | 41 ----------
 .../user-aliases-usb.x86_64-latest.args       | 44 +++++++++++
 tests/qemuxml2argvdata/user-aliases.args      | 68 -----------------
 .../user-aliases.x86_64-latest.args           | 74 +++++++++++++++++++
 tests/qemuxml2argvdata/user-aliases2.args     |  1 -
 .../user-aliases2.x86_64-latest.args          | 39 ++++++++++
 tests/qemuxml2argvtest.c                      | 14 +---
 7 files changed, 160 insertions(+), 121 deletions(-)
 delete mode 100644 tests/qemuxml2argvdata/user-aliases-usb.args
 create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args
 delete mode 100644 tests/qemuxml2argvdata/user-aliases.args
 create mode 100644 tests/qemuxml2argvdata/user-aliases.x86_64-latest.args
 delete mode 120000 tests/qemuxml2argvdata/user-aliases2.args
 create mode 100644 tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args

diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
deleted file mode 100644
index 932c3ea296..0000000000
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ /dev/null
@@ -1,41 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-gentoo \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=gentoo,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-gentoo/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel kvm \
--m 4096 \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--global PIIX4_PM.disable_s3=0 \
--global PIIX4_PM.disable_s4=0 \
--boot strict=on \
--device ich9-usb-ehci1,id=ua-myUSB1,bus=pci.0,addr=0x4.0x7 \
--device ich9-usb-uhci1,masterbus=ua-myUSB1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
--device ich9-usb-uhci2,masterbus=ua-myUSB1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
--device ich9-usb-uhci3,masterbus=ua-myUSB1.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
--device ich9-usb-ehci1,id=ua-myUSB5,bus=pci.0,addr=0x5.0x7 \
--device ich9-usb-uhci1,masterbus=ua-myUSB5.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \
--device ich9-usb-uhci2,masterbus=ua-myUSB5.0,firstport=2,bus=pci.0,addr=0x5.0x1 \
--device ich9-usb-uhci3,masterbus=ua-myUSB5.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
--audiodev '{"id":"audio1","driver":"none"}' \
--device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=ua-myUSB1.0,port=3 \
--device usb-host,hostbus=15,hostaddr=6,id=hostdev1,bus=ua-myUSB5.0,port=3 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args b/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args
new file mode 100644
index 0000000000..fd5c161f19
--- /dev/null
+++ b/tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args
@@ -0,0 +1,44 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-gentoo \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=gentoo,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-gentoo/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu qemu64 \
+-m 4096 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-global PIIX4_PM.disable_s3=0 \
+-global PIIX4_PM.disable_s4=0 \
+-boot strict=on \
+-device '{"driver":"ich9-usb-ehci1","id":"ua-myUSB1","bus":"pci.0","addr":"0x4.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"ua-myUSB1.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x4"}' \
+-device '{"driver":"ich9-usb-uhci2","masterbus":"ua-myUSB1.0","firstport":2,"bus":"pci.0","addr":"0x4.0x1"}' \
+-device '{"driver":"ich9-usb-uhci3","masterbus":"ua-myUSB1.0","firstport":4,"bus":"pci.0","addr":"0x4.0x2"}' \
+-device '{"driver":"ich9-usb-ehci1","id":"ua-myUSB5","bus":"pci.0","addr":"0x5.0x7"}' \
+-device '{"driver":"ich9-usb-uhci1","masterbus":"ua-myUSB5.0","firstport":0,"bus":"pci.0","multifunction":true,"addr":"0x5"}' \
+-device '{"driver":"ich9-usb-uhci2","masterbus":"ua-myUSB5.0","firstport":2,"bus":"pci.0","addr":"0x5.0x1"}' \
+-device '{"driver":"ich9-usb-uhci3","masterbus":"ua-myUSB5.0","firstport":4,"bus":"pci.0","addr":"0x5.0x2"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/014/006","id":"hostdev0","bus":"ua-myUSB1.0","port":"3"}' \
+-device '{"driver":"usb-host","hostdevice":"/dev/bus/usb/015/006","id":"hostdev1","bus":"ua-myUSB5.0","port":"3"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
deleted file mode 100644
index 25eb4f4f90..0000000000
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ /dev/null
@@ -1,68 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-gentoo \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
-/usr/bin/qemu-system-x86_64 \
--name guest=gentoo,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-gentoo/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
--accel kvm \
--m 4096 \
--overcommit mem-lock=off \
--smp 4,sockets=4,cores=1,threads=1 \
--object memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
--numa node,nodeid=0,cpus=0,memdev=ram-node0 \
--object memory-backend-file,id=ram-node1,mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
--numa node,nodeid=1,cpus=1,memdev=ram-node1 \
--object memory-backend-file,id=ram-node2,mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
--numa node,nodeid=2,cpus=2,memdev=ram-node2 \
--object memory-backend-file,id=ram-node3,mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824 \
--numa node,nodeid=3,cpus=3,memdev=ram-node3 \
--uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--global PIIX4_PM.disable_s3=0 \
--global PIIX4_PM.disable_s4=0 \
--boot strict=on \
--device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 \
--usb \
--device usb-ccid,id=ua-myCCID,bus=ua-SomeWeirdController.0,port=1 \
--device usb-ccid,id=ua-myCCID2,bus=ua-SomeWeirdController.0,port=2 \
--drive file=/var/lib/libvirt/images/fd.img,format=raw,if=none,id=drive-ua-myDisk1,cache=none \
--drive file=/var/lib/libvirt/images/gentoo.qcow2,format=qcow2,if=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-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-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 \
--drive file=/home/zippy/tmp/install-amd64-minimal-20140619.iso,format=raw,if=none,id=drive-ua-WhatAnAwesomeCDROM,readonly=on,cache=none \
--device ide-cd,bus=ide.1,unit=0,drive=drive-ua-WhatAnAwesomeCDROM,id=ua-WhatAnAwesomeCDROM,bootindex=2 \
--global isa-fdc.driveA=drive-ua-myDisk1 \
--netdev tap,fd=3,vhost=on,vhostfd=44,id=hostua-CheckoutThisNIC \
--device virtio-net-pci,netdev=hostua-CheckoutThisNIC,id=ua-CheckoutThisNIC,mac=52:54:00:d6:c0:0b,bus=pci.0,addr=0x3 \
--netdev socket,listen=127.0.0.1:1234,id=hostua-WeCanAlsoDoServerMode \
--device rtl8139,netdev=hostua-WeCanAlsoDoServerMode,id=ua-WeCanAlsoDoServerMode,mac=52:54:00:22:c9:42,bus=pci.0,addr=0x9 \
--netdev socket,connect=127.0.0.1:1234,id=hostua-AndAlsoClientMode \
--device rtl8139,netdev=hostua-AndAlsoClientMode,id=ua-AndAlsoClientMode,mac=52:54:00:8c:b1:f8,bus=pci.0,addr=0xa \
--device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ua-myCCID.0 \
--chardev pty,id=charserial0 \
--device isa-serial,chardev=charserial0,id=serial0,index=0 \
--chardev pty,id=charserial1 \
--device isa-serial,chardev=charserial1,id=serial1,index=1 \
--chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
--device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
--audiodev '{"id":"audio1","driver":"none"}' \
--vnc 127.0.0.1:0,audiodev=audio1 \
--device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
--device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args b/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args
new file mode 100644
index 0000000000..d1a3f4af07
--- /dev/null
+++ b/tests/qemuxml2argvdata/user-aliases.x86_64-latest.args
@@ -0,0 +1,74 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-gentoo \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
+/usr/bin/qemu-system-x86_64 \
+-name guest=gentoo,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-gentoo/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu qemu64 \
+-m 4096 \
+-overcommit mem-lock=off \
+-smp 4,sockets=4,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-gentoo","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-gentoo","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node2","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-gentoo","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=2,cpus=2,memdev=ram-node2 \
+-object '{"qom-type":"memory-backend-file","id":"ram-node3","mem-path":"/dev/hugepages1G/libvirt/qemu/-1-gentoo","prealloc":true,"size":1073741824}' \
+-numa node,nodeid=3,cpus=3,memdev=ram-node3 \
+-uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-global PIIX4_PM.disable_s3=0 \
+-global PIIX4_PM.disable_s4=0 \
+-boot strict=on \
+-device '{"driver":"piix3-usb-uhci","id":"ua-SomeWeirdController","bus":"pci.0","addr":"0x1.0x2"}' \
+-device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.0","addr":"0x8"}' \
+-device '{"driver":"usb-ccid","id":"ua-myCCID","bus":"ua-SomeWeirdController.0","port":"1"}' \
+-device '{"driver":"usb-ccid","id":"ua-myCCID2","bus":"ua-SomeWeirdController.0","port":"2"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/fd.img","node-name":"libvirt-4-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-4-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-4-storage"}' \
+-device '{"driver":"floppy","unit":0,"drive":"libvirt-4-format","id":"ua-myDisk1","write-cache":"on"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/gentoo.qcow2","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"qcow2","file":"libvirt-3-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x5","drive":"libvirt-3-format","id":"ua-myDisk2","bootindex":1}' \
+-object '{"qom-type":"secret","id":"libvirt-2-format-encryption-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/OtherDemo.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","encrypt":{"format":"luks","key-secret":"libvirt-2-format-encryption-secret0"},"file":"libvirt-2-storage"}' \
+-device '{"driver":"virtio-blk-pci","bus":"pci.0","addr":"0x7","drive":"libvirt-2-format","id":"ua-myEncryptedDisk1"}' \
+-blockdev '{"driver":"file","filename":"/home/zippy/tmp/install-amd64-minimal-20140619.iso","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-cd","bus":"ide.1","unit":0,"share-rw":true,"drive":"libvirt-1-format","id":"ua-WhatAnAwesomeCDROM","bootindex":2,"write-cache":"on"}' \
+-netdev tap,fd=3,vhost=on,vhostfd=44,id=hostua-CheckoutThisNIC \
+-device '{"driver":"virtio-net-pci","netdev":"hostua-CheckoutThisNIC","id":"ua-CheckoutThisNIC","mac":"52:54:00:d6:c0:0b","bus":"pci.0","addr":"0x3"}' \
+-netdev socket,listen=127.0.0.1:1234,id=hostua-WeCanAlsoDoServerMode \
+-device '{"driver":"rtl8139","netdev":"hostua-WeCanAlsoDoServerMode","id":"ua-WeCanAlsoDoServerMode","mac":"52:54:00:22:c9:42","bus":"pci.0","addr":"0x9"}' \
+-netdev socket,connect=127.0.0.1:1234,id=hostua-AndAlsoClientMode \
+-device '{"driver":"rtl8139","netdev":"hostua-AndAlsoClientMode","id":"ua-AndAlsoClientMode","mac":"52:54:00:8c:b1:f8","bus":"pci.0","addr":"0xa"}' \
+-device '{"driver":"ccid-card-emulated","backend":"nss-emulated","id":"smartcard0","bus":"ua-myCCID.0"}' \
+-chardev pty,id=charserial0 \
+-device '{"driver":"isa-serial","chardev":"charserial0","id":"serial0","index":0}' \
+-chardev pty,id=charserial1 \
+-device '{"driver":"isa-serial","chardev":"charserial1","id":"serial1","index":1}' \
+-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
+-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
+-device '{"driver":"cirrus-vga","id":"video0","bus":"pci.0","addr":"0x2"}' \
+-device '{"driver":"intel-hda","id":"sound0","bus":"pci.0","addr":"0x4"}' \
+-device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad":0,"audiodev":"audio1"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x6"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/user-aliases2.args b/tests/qemuxml2argvdata/user-aliases2.args
deleted file mode 120000
index d63573a9a5..0000000000
--- a/tests/qemuxml2argvdata/user-aliases2.args
+++ /dev/null
@@ -1 +0,0 @@
-boot-floppy-q35.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args b/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args
new file mode 100644
index 0000000000..7f34c7a965
--- /dev/null
+++ b/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args
@@ -0,0 +1,39 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine q35,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
+-device '{"driver":"isa-fdc","bootindexA":1}' \
+-blockdev '{"driver":"file","filename":"/tmp/firmware.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0-0-0"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 9eba7c02a4..6bcceaad0e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3249,17 +3249,9 @@ mymain(void)
     DO_TEST_PARSE_ERROR("cpu-cache-passthrough-l3", QEMU_CAPS_KVM);
     DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO);

-    DO_TEST("user-aliases", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_CIRRUS_VGA,
-            QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_PIIX_DISABLE_S3,
-            QEMU_CAPS_PIIX_DISABLE_S4, QEMU_CAPS_VNC,
-            QEMU_CAPS_DEVICE_ISA_SERIAL,
-            QEMU_CAPS_HDA_DUPLEX,
-            QEMU_CAPS_CCID_EMULATED,
-            QEMU_CAPS_QCOW2_LUKS);
-    DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI);
-    DO_TEST("user-aliases-usb", QEMU_CAPS_KVM,
-            QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
-            QEMU_CAPS_ICH9_USB_EHCI1);
+    DO_TEST_CAPS_LATEST("user-aliases");
+    DO_TEST_CAPS_LATEST("user-aliases2");
+    DO_TEST_CAPS_LATEST("user-aliases-usb");

     DO_TEST_CAPS_LATEST("tseg-explicit-size");
     DO_TEST_CAPS_LATEST_PARSE_ERROR("tseg-i440fx");
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:52 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:52 +0200
Subject: [PATCH 14/80] tests: Force QEMU_CAPS_BLOCKDEV(_HOSTDEV_SCSI) in fake
 caps tests
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f2f0e9d5aecbc9cc1ee524455099b87d5bfe9d6b.1658843187.git.pkrempa@redhat.com>

Until we finish removing the capabilities we need to force them in the
tests so that it's obvious that the code changes have no impact.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 .../aarch64-aavmf-virtio-mmio.args            |   5 +-
 .../aarch64-cpu-passthrough.args              |   5 +-
 .../aarch64-kvm-32-on-64.args                 |   5 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |   5 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |   5 +-
 .../aarch64-virtio-pci-default.args           |   5 +-
 .../aarch64-virtio-pci-manual-addresses.args  |   5 +-
 .../arm-vexpressa9-virtio.args                |   5 +-
 tests/qemuxml2argvdata/arm-virt-virtio.args   |   5 +-
 tests/qemuxml2argvdata/audio-default-sdl.args |   5 +-
 .../qemuxml2argvdata/audio-default-spice.args |   5 +-
 tests/qemuxml2argvdata/audio-default-vnc.args |   5 +-
 tests/qemuxml2argvdata/autoindex.args         |   5 +-
 .../qemuxml2argvdata/balloon-device-auto.args |   5 +-
 .../balloon-device-deflate-off.args           |   5 +-
 .../balloon-device-deflate.args               |   5 +-
 .../balloon-device-period.args                |   5 +-
 tests/qemuxml2argvdata/balloon-device.args    |   5 +-
 tests/qemuxml2argvdata/blkiotune-device.args  |   5 +-
 tests/qemuxml2argvdata/blkiotune.args         |   5 +-
 tests/qemuxml2argvdata/boot-cdrom.args        |   5 +-
 tests/qemuxml2argvdata/boot-complex.args      |  35 +-
 tests/qemuxml2argvdata/boot-floppy-q35.args   |   6 +-
 tests/qemuxml2argvdata/boot-floppy.args       |  10 +-
 .../boot-menu-disable-drive.args              |   5 +-
 tests/qemuxml2argvdata/boot-menu-disable.args |   5 +-
 .../boot-menu-enable-with-timeout.args        |   5 +-
 tests/qemuxml2argvdata/boot-menu-enable.args  |   5 +-
 tests/qemuxml2argvdata/boot-multi.args        |   5 +-
 tests/qemuxml2argvdata/boot-network.args      |   5 +-
 tests/qemuxml2argvdata/boot-order.args        |  20 +-
 tests/qemuxml2argvdata/channel-guestfwd.args  |   5 +-
 tests/qemuxml2argvdata/channel-spicevmc.args  |   5 +-
 .../qemuxml2argvdata/channel-virtio-auto.args |   5 +-
 .../channel-virtio-autoadd.args               |   5 +-
 .../channel-virtio-autoassign.args            |   5 +-
 .../channel-virtio-default.args               |   5 +-
 .../channel-virtio-state.args                 |   5 +-
 .../qemuxml2argvdata/channel-virtio-unix.args |   5 +-
 tests/qemuxml2argvdata/channel-virtio.args    |   5 +-
 tests/qemuxml2argvdata/clock-catchup.args     |   5 +-
 tests/qemuxml2argvdata/clock-france.args      |   5 +-
 tests/qemuxml2argvdata/clock-hpet-off.args    |   5 +-
 .../clock-localtime-basis-localtime.args      |   5 +-
 tests/qemuxml2argvdata/clock-localtime.args   |   5 +-
 tests/qemuxml2argvdata/clock-realtime.args    |   5 +-
 tests/qemuxml2argvdata/clock-utc.args         |   5 +-
 tests/qemuxml2argvdata/clock-variable.args    |   5 +-
 .../qemuxml2argvdata/console-compat-auto.args |   5 +-
 .../console-compat-chardev.args               |   5 +-
 tests/qemuxml2argvdata/console-compat.args    |   5 +-
 .../qemuxml2argvdata/console-virtio-ccw.args  |   5 +-
 .../qemuxml2argvdata/console-virtio-many.args |   5 +-
 tests/qemuxml2argvdata/console-virtio.args    |   5 +-
 tests/qemuxml2argvdata/controller-order.args  |  10 +-
 .../cpu-host-passthrough-features.args        |   5 +-
 .../qemuxml2argvdata/cputune-zero-shares.args |   5 +-
 tests/qemuxml2argvdata/cputune.args           |   5 +-
 .../firmware-manual-efi-acpi-aarch64.args     |   8 +-
 .../firmware-manual-efi-acpi-q35.args         |   8 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |   8 +-
 .../firmware-manual-efi-secure.args           |   8 +-
 .../qemuxml2argvdata/firmware-manual-efi.args |   8 +-
 .../qemuxml2argvdata/graphics-dbus-audio.args |   5 +-
 .../graphics-egl-headless.args                |   5 +-
 .../graphics-sdl-fullscreen.args              |   5 +-
 tests/qemuxml2argvdata/graphics-sdl.args      |   5 +-
 .../hostdev-scsi-vhost-scsi-ccw.args          |   5 +-
 .../hostdev-scsi-vhost-scsi-pci.args          |   5 +-
 .../hostdev-vfio-multidomain.args             |   5 +-
 tests/qemuxml2argvdata/hostdev-vfio.args      |   5 +-
 .../qemuxml2argvdata/hugepages-memaccess.args |   5 +-
 .../hugepages-memaccess2.args                 |   5 +-
 tests/qemuxml2argvdata/hugepages-shared.args  |   5 +-
 .../hvf-aarch64-virt-headless.args            |  13 +-
 .../hvf-x86_64-q35-headless.args              |   5 +-
 .../qemuxml2argvdata/input-usbmouse-addr.args |   5 +-
 tests/qemuxml2argvdata/input-usbmouse.args    |   5 +-
 tests/qemuxml2argvdata/input-usbtablet.args   |   5 +-
 tests/qemuxml2argvdata/input-virtio-ccw.args  |   5 +-
 .../iothreads-disk-virtio-ccw.args            |  10 +-
 tests/qemuxml2argvdata/iothreads-disk.args    |  15 +-
 .../iothreads-ids-partial.args                |   5 +-
 tests/qemuxml2argvdata/iothreads-ids.args     |   5 +-
 tests/qemuxml2argvdata/iothreads.args         |   5 +-
 tests/qemuxml2argvdata/kvm-pit-delay.args     |   5 +-
 tests/qemuxml2argvdata/kvm-pit-discard.args   |   5 +-
 .../machine-aeskeywrap-off-cap.args           |   5 +-
 .../machine-aeskeywrap-off-caps.args          |   5 +-
 .../machine-aeskeywrap-on-cap.args            |   5 +-
 .../machine-aeskeywrap-on-caps.args           |   5 +-
 tests/qemuxml2argvdata/machine-aliases1.args  |   5 +-
 tests/qemuxml2argvdata/machine-aliases2.args  |   5 +-
 tests/qemuxml2argvdata/machine-core-off.args  |   5 +-
 tests/qemuxml2argvdata/machine-core-on.args   |   5 +-
 .../machine-deakeywrap-off-cap.args           |   5 +-
 .../machine-deakeywrap-off-caps.args          |   5 +-
 .../machine-deakeywrap-on-cap.args            |   5 +-
 .../machine-deakeywrap-on-caps.args           |   5 +-
 .../machine-keywrap-none-caps.args            |   5 +-
 .../machine-keywrap-none.args                 |   5 +-
 ...ine-loadparm-multiple-disks-nets-s390.args |  10 +-
 .../machine-loadparm-s390.args                |   5 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |   5 +-
 tests/qemuxml2argvdata/master-key.args        |   5 +-
 .../memory-hotplug-dimm-addr.args             |   5 +-
 .../qemuxml2argvdata/memory-hotplug-dimm.args |   5 +-
 tests/qemuxml2argvdata/memory-hotplug.args    |   5 +-
 tests/qemuxml2argvdata/memtune-unlimited.args |   5 +-
 tests/qemuxml2argvdata/memtune.args           |   5 +-
 tests/qemuxml2argvdata/migrate.args           |   5 +-
 tests/qemuxml2argvdata/minimal.args           |   5 +-
 tests/qemuxml2argvdata/misc-acpi.args         |   5 +-
 tests/qemuxml2argvdata/misc-disable-s3.args   |   5 +-
 .../misc-disable-suspends.args                |   5 +-
 tests/qemuxml2argvdata/misc-enable-s4.args    |   5 +-
 tests/qemuxml2argvdata/misc-uuid.args         |   5 +-
 tests/qemuxml2argvdata/monitor-json.args      |   5 +-
 .../multifunction-pci-device.args             |   5 +-
 tests/qemuxml2argvdata/net-client.args        |   5 +-
 tests/qemuxml2argvdata/net-eth-hostip.args    |   5 +-
 tests/qemuxml2argvdata/net-eth-ifname.args    |   5 +-
 tests/qemuxml2argvdata/net-eth-names.args     |   5 +-
 .../net-eth-unmanaged-tap.args                |   5 +-
 tests/qemuxml2argvdata/net-eth.args           |   5 +-
 .../net-hostdev-bootorder.args                |   5 +-
 .../net-hostdev-multidomain.args              |   5 +-
 .../net-hostdev-vfio-multidomain.args         |   5 +-
 tests/qemuxml2argvdata/net-hostdev-vfio.args  |   5 +-
 tests/qemuxml2argvdata/net-hostdev.args       |   5 +-
 tests/qemuxml2argvdata/net-mcast.args         |   5 +-
 tests/qemuxml2argvdata/net-server.args        |   5 +-
 tests/qemuxml2argvdata/net-udp.args           |   5 +-
 tests/qemuxml2argvdata/net-user-addr.args     |   5 +-
 tests/qemuxml2argvdata/net-user.args          |   5 +-
 .../net-vhostuser-multiq.args                 |   5 +-
 tests/qemuxml2argvdata/net-virtio-device.args |   5 +-
 .../net-virtio-disable-offloads.args          |   5 +-
 tests/qemuxml2argvdata/net-virtio-netdev.args |   5 +-
 .../net-virtio-rxtxqueuesize.args             |   5 +-
 .../net-virtio-teaming-hostdev.args           |   5 +-
 .../qemuxml2argvdata/net-virtio-teaming.args  |   5 +-
 tests/qemuxml2argvdata/net-virtio.args        |   5 +-
 tests/qemuxml2argvdata/nosharepages.args      |   5 +-
 .../numad-auto-memory-vcpu-cpuset.args        |   5 +-
 ...o-memory-vcpu-no-cpuset-and-placement.args |   5 +-
 .../numad-auto-vcpu-static-numatune.args      |   5 +-
 .../numad-static-memory-auto-vcpu.args        |   5 +-
 tests/qemuxml2argvdata/numad.args             |   5 +-
 .../numatune-auto-nodeset-invalid.args        |   5 +-
 tests/qemuxml2argvdata/numatune-memory.args   |   5 +-
 .../parallel-parport-chardev.args             |   5 +-
 .../parallel-tcp-chardev.args                 |   5 +-
 tests/qemuxml2argvdata/pci-autoadd-addr.args  |   5 +-
 tests/qemuxml2argvdata/pci-autoadd-idx.args   |   5 +-
 tests/qemuxml2argvdata/pci-autofill-addr.args |   5 +-
 .../pci-bridge-many-disks.args                | 525 +++++++++++-------
 tests/qemuxml2argvdata/pci-bridge.args        |   5 +-
 tests/qemuxml2argvdata/pci-many.args          | 145 +++--
 tests/qemuxml2argvdata/pci-rom.args           |   5 +-
 .../pci-serial-dev-chardev.args               |   5 +-
 tests/qemuxml2argvdata/pcie-expander-bus.args |   5 +-
 tests/qemuxml2argvdata/pcie-root-port.args    |   5 +-
 .../pcie-switch-downstream-port.args          |   5 +-
 .../pcie-switch-upstream-port.args            |   5 +-
 tests/qemuxml2argvdata/pcihole64-q35.args     |   5 +-
 .../pseries-vio-user-assigned.args            |   5 +-
 tests/qemuxml2argvdata/pseries-vio.args       |   5 +-
 tests/qemuxml2argvdata/q35-pcie-autoadd.args  |   5 +-
 tests/qemuxml2argvdata/q35-pcie.args          |   5 +-
 tests/qemuxml2argvdata/q35-usb2-multi.args    |   5 +-
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |   5 +-
 tests/qemuxml2argvdata/q35-usb2.args          |   5 +-
 .../q35-virt-manager-basic.args               |   5 +-
 tests/qemuxml2argvdata/q35-virtio-pci.args    |   5 +-
 tests/qemuxml2argvdata/q35.args               |   5 +-
 tests/qemuxml2argvdata/qemu-ns-alt.args       |   5 +-
 .../qemu-ns-commandline-ns0.args              |   5 +-
 .../qemu-ns-commandline-ns1.args              |   5 +-
 .../qemuxml2argvdata/qemu-ns-commandline.args |   5 +-
 .../qemu-ns-domain-commandline-ns0.args       |   5 +-
 .../qemu-ns-domain-commandline.args           |   5 +-
 .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |   5 +-
 tests/qemuxml2argvdata/qemu-ns-no-env.args    |   5 +-
 tests/qemuxml2argvdata/restore-v2-fd.args     |   5 +-
 tests/qemuxml2argvdata/restore-v2.args        |   5 +-
 tests/qemuxml2argvdata/riscv64-virt-pci.args  |   5 +-
 tests/qemuxml2argvdata/riscv64-virt.args      |   5 +-
 tests/qemuxml2argvdata/seclabel-dac-none.args |   5 +-
 .../seclabel-dynamic-baselabel.args           |   5 +-
 .../seclabel-dynamic-labelskip.args           |   5 +-
 .../seclabel-dynamic-override.args            |  10 +-
 .../seclabel-dynamic-relabel.args             |   5 +-
 tests/qemuxml2argvdata/seclabel-dynamic.args  |   5 +-
 tests/qemuxml2argvdata/seclabel-none.args     |   5 +-
 .../seclabel-static-labelskip.args            |   5 +-
 .../seclabel-static-relabel.args              |   5 +-
 tests/qemuxml2argvdata/seclabel-static.args   |   5 +-
 .../serial-dev-chardev-iobase.args            |   5 +-
 .../qemuxml2argvdata/serial-dev-chardev.args  |   5 +-
 .../qemuxml2argvdata/serial-file-chardev.args |   5 +-
 tests/qemuxml2argvdata/serial-file-log.args   |   5 +-
 .../qemuxml2argvdata/serial-many-chardev.args |   5 +-
 .../qemuxml2argvdata/serial-pty-chardev.args  |   5 +-
 tests/qemuxml2argvdata/serial-spiceport.args  |   5 +-
 .../qemuxml2argvdata/serial-tcp-chardev.args  |   5 +-
 .../serial-tcp-telnet-chardev.args            |   5 +-
 .../serial-tcp-tlsx509-chardev-notls.args     |   5 +-
 .../serial-tcp-tlsx509-chardev-verify.args    |   5 +-
 .../serial-tcp-tlsx509-chardev.args           |   5 +-
 .../serial-tcp-tlsx509-secret-chardev.args    |   5 +-
 .../qemuxml2argvdata/serial-udp-chardev.args  |   5 +-
 tests/qemuxml2argvdata/serial-vc-chardev.args |   5 +-
 tests/qemuxml2argvdata/smbios-type-fwcfg.args |   5 +-
 tests/qemuxml2argvdata/smbios.args            |   5 +-
 tests/qemuxml2argvdata/smp-dies.args          |   5 +-
 tests/qemuxml2argvdata/smp.args               |   5 +-
 tests/qemuxml2argvdata/sound-device.args      |   5 +-
 tests/qemuxml2argvdata/sound.args             |   5 +-
 tests/qemuxml2argvdata/sparc-minimal.args     |  10 +-
 .../video-device-pciaddr-default.args         |   5 +-
 tests/qemuxml2argvdata/video-none-device.args |   5 +-
 .../video-qxl-device-vgamem.args              |   5 +-
 tests/qemuxml2argvdata/video-qxl-device.args  |   5 +-
 tests/qemuxml2argvdata/video-qxl-heads.args   |   5 +-
 tests/qemuxml2argvdata/video-qxl-noheads.args |   5 +-
 .../video-qxl-resolution.args                 |   5 +-
 .../video-qxl-sec-device-vgamem.args          |   5 +-
 .../video-qxl-sec-device.args                 |   5 +-
 .../video-vga-device-vgamem.args              |   5 +-
 tests/qemuxml2argvdata/video-vga-device.args  |   5 +-
 .../qemuxml2argvdata/video-vga-qxl-heads.args |   5 +-
 .../video-virtio-gpu-ccw.args                 |   5 +-
 .../video-virtio-gpu-device.args              |   5 +-
 .../video-virtio-gpu-sdl-gl.args              |   5 +-
 .../video-virtio-gpu-spice-gl.args            |   5 +-
 .../video-virtio-gpu-virgl.args               |   5 +-
 tests/qemuxml2argvdata/video-virtio-vga.args  |   5 +-
 tests/qemuxml2argvdata/virtio-rng-ccw.args    |   5 +-
 tests/qemuxml2argvdata/vmcoreinfo.args        |   5 +-
 tests/testutilsqemu.c                         |   4 +
 241 files changed, 1187 insertions(+), 786 deletions(-)

diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 23edbd4edb..9955ca3dbc 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
 -dtb /aarch64.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
--drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/aarch64.raw","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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charconsole0 \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 6a9898193f..447fcedf84 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/aarch64.raw","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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index 6ac50d6f17..0b22efecd2 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -28,8 +28,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 -kernel /arm.kernel \
 -initrd /arm.initrd \
 -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
--drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/arm.raw","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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index 7f8bd9d402..15f8f16975 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -34,8 +34,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device ioh3420,port=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x2 \
--drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/aarch64.raw","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,bus=pci.2,addr=0x3,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.2,addr=0x1 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 4a78ab1038..575727a694 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
 -dtb /aarch64.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
--drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/aarch64.raw","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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 2e2b523b07..aa7c04e9c6 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -37,8 +37,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -device ioh3420,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device ioh3420,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
--drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/aarch64.raw","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,bus=pci.3,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,addr=0x0 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 671854a250..3000fea1a6 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -34,8 +34,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
 -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.1,addr=0x1 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \
--drive file=/aarch64.raw,format=raw,if=none,id=drive-scsi0-0-0-0 \
--device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/aarch64.raw","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 scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi0-0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,addr=0x2 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index c8fd7ec981..bb2097bd48 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -30,8 +30,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 -dtb /arm.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
 -usb \
--drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/arm.raw","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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
index fb0bf0e374..be24dc0e71 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -29,8 +29,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 -append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
 -dtb /arm.dtb \
 -device virtio-serial-device,id=virtio-serial0 \
--drive file=/arm.raw,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/arm.raw","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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.args
index f64c20ce3c..522a0cedb3 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -26,8 +26,9 @@ SDL_AUDIODRIVER=esd \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"sdl"}' \
 -display sdl \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.args
index 2b6946e99a..fd9a7850e0 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,seamless-migration=on \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.args
index 862bde252f..19b80f8d0f 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"alsa"}' \
 -vnc 127.0.0.1:0,audiodev=audio1 \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
index 08a496c9b7..a80f49c461 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -54,7 +54,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device ich9-usb-uhci2,masterbus=usb4.0,firstport=2,bus=pci.2,addr=0x2.0x1 \
 -device ich9-usb-uhci3,masterbus=usb4.0,firstport=4,bus=pci.2,addr=0x2.0x2 \
 -device ich9-usb-ehci1,id=usb4,bus=pci.2,addr=0x2.0x7 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index de5a740a5c..08122249a1 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,deflate-on-oom=off,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 060e1fc617..bac27e20a9 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,deflate-on-oom=on,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
index 7ca265fd15..925f534ae2 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
index 7ca265fd15..925f534ae2 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index 59095372f5..cba00fa112 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index bf97a62e1b..5eb78e291b 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -26,21 +26,28 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
--drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/dev/HostVG/hda,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 \
--drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
--drive file=/dev/HostVG/hdc,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,bootindex=1 \
--drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
--drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
--global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=4 \
--global isa-fdc.driveB=drive-fdc0-0-1 \
+-blockdev '{"driver":"file","filename":"/tmp/vda.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}' \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=libvirt-7-format,id=virtio-disk0,bootindex=3 \
+-blockdev '{"driver":"file","filename":"/tmp/vdb.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=libvirt-6-format,id=virtio-disk1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hda","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-5-format,id=ide0-0-0 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdb","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 ide-hd,bus=ide.0,unit=1,drive=libvirt-4-format,id=ide0-0-1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/hdc","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-3-format,id=ide0-1-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/fd0","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 floppy,unit=0,drive=libvirt-2-format,id=fdc0-0-0 \
+-blockdev '{"driver":"host_device","filename":"/dev/fd1","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 floppy,unit=1,drive=libvirt-1-format,id=fdc0-0-1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bootindex=2,bus=pci.0,addr=0x2 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 632664c46b..7a4737f925 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -25,7 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
--device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \
+-device isa-fdc,bootindexA=1 \
+-blockdev '{"driver":"file","filename":"/tmp/firmware.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 floppy,unit=0,drive=libvirt-1-format,id=fdc0-0-0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index b449214b7f..467ca1342b 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -26,10 +26,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
--drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
--global isa-fdc.driveA=drive-fdc0-0-0 \
 -global isa-fdc.bootindexA=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0 \
+-blockdev '{"driver":"file","filename":"/tmp/firmware.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 floppy,unit=0,drive=libvirt-1-format,id=fdc0-0-0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 3538921f0e..e307121a6e 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot menu=off,strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index 3538921f0e..e307121a6e 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot menu=off,strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 4a799dfe10..d77a63ae5e 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot menu=on,splash-time=3000,strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index 5b5cf2c559..777918fa80 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot menu=on,strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index 5b5cf2c559..777918fa80 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot menu=on,strict=on \
 -usb \
--drive file=/dev/cdrom,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,bootindex=1 \
+-blockdev '{"driver":"host_cdrom","filename":"/dev/cdrom","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index 30369ad55e..451e5ef66a 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index 241639546f..6d465ff2a8 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -26,15 +26,19 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
--drive file=/root/boot.iso,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,bootindex=1 \
--drive file=sheepdog:example.org:6000:image,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
--drive file=/dev/null,format=raw,if=none,id=drive-fdc0-0-1 \
--global isa-fdc.driveB=drive-fdc0-0-1 \
 -global isa-fdc.bootindexB=4 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-4-format,id=ide0-0-0 \
+-blockdev '{"driver":"file","filename":"/root/boot.iso","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-3-format","read-only":true,"driver":"raw","file":"libvirt-3-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-3-format,id=ide0-1-0,bootindex=1 \
+-blockdev '{"driver":"sheepdog","server":{"type":"inet","host":"example.org","port":"6000"},"vdi":"image","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=0x3,drive=libvirt-2-format,id=virtio-disk0,bootindex=3 \
+-blockdev '{"driver":"file","filename":"/dev/null","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 floppy,unit=1,drive=libvirt-1-format,id=fdc0-0-1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bootindex=2,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index 52411f9289..78fe3d37c2 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pipe,id=charchannel0,path=/tmp/guestfwd \
 -netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index 0671ae2660..c9a266b9ea 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev spicevmc,id=charchannel0,name=vdagent \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 \
 -audiodev '{"id":"audio1","driver":"spice"}' \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 311860cc67..5b5072d56e 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -29,8 +29,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x3 \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \
 -chardev pty,id=charchannel1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index e78c7a758b..7cca11ac76 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -28,8 +28,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x3 \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \
 -chardev pty,id=charchannel1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 5974937da3..330d843faa 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -28,8 +28,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.0 \
 -chardev pty,id=charchannel1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index 278ce4b731..73de60f518 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \
 -chardev spicevmc,id=charchannel1,name=vdagent \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index ea49528e02..7f3754fc2a 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo \
 -chardev pty,id=charchannel1 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 45a102bbac..baea530a4d 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -28,8 +28,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
 -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0 \
 -chardev socket,id=charchannel1,fd=1729,server=on,wait=off \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index c96c019b6c..ea2b97654b 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charchannel0 \
 -device virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index 0ec9e70f22..c51a40d645 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index a5a8f3a088..3d0a24caa6 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -27,8 +27,9 @@ TZ=Europe/Paris \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index 1979882c36..2ecd29ca29 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 3a03f782c0..c6d55dbacf 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
index 7cd450c9be..177e5738f3 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2argvdata/clock-realtime.args
index 4b9321552f..2ab04bc929 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
index 39bc2c0a6e..4029e9e1e6 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index 9d03ac30ff..bb176dd511 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index cf08357b27..a495cc9c92 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index cf08357b27..a495cc9c92 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 7013b6b570..f6c7ca9361 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
index a663029542..f8e012f4b7 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index 534d75fbee..33892634d5 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev pty,id=charconsole1 \
diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index c11c01ed2f..5e3788fcc1 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=on \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args
index 9fcc9560f6..fd9eba459a 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -27,10 +27,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \
 -device usb-hub,id=hub0,bus=usb.0,port=1 \
 -device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \
--drive file=/tmp/fdr.img,format=raw,if=none,id=drive-virtio-disk0,cache=none,aio=native \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/tmp/Fedora-17-x86_64-Live-Desktop.iso,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 \
+-blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:4d:4b:19,bootindex=2,bus=pci.0,addr=0x3 \
 -chardev spicevmc,id=charsmartcard0,name=smartcard \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 56597bafdf..4c87e1b5ad 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
index 3ff17a498e..8e89eb8e54 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
@@ -10,10 +10,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
--drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
--drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 1024 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
index 776f9fb467..08280c18ea 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
@@ -10,10 +10,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine q35,usb=off,dump-guest-core=off \
+-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
+-machine q35,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
--drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
--drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 1024 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
index a0dcc22db2..b135a30201 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
@@ -10,10 +10,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-blockdev '{"driver":"file","filename":"/usr/share/AAVMF/AAVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
--drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
--drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 1024 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
index 94ee0e48c0..996acbb244 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@@ -10,11 +10,13 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -name guest=test-bios,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
--machine q35,usb=off,smm=on,dump-guest-core=off \
+-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.secboot.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
+-machine q35,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -global driver=cfi.pflash01,property=secure,value=on \
--drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \
--drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 1024 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.args b/tests/qemuxml2argvdata/firmware-manual-efi.args
index 8fb23cc1e6..1ee322bf08 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi.args
@@ -10,10 +10,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -name guest=test-bios,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
--machine pc,usb=off,dump-guest-core=off \
+-blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
+-machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
--drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
--drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 1024 \
 -overcommit mem-lock=off \
 -smp 1,sockets=1,cores=1,threads=1 \
diff --git a/tests/qemuxml2argvdata/graphics-dbus-audio.args b/tests/qemuxml2argvdata/graphics-dbus-audio.args
index 968dddfd89..a222d5d88a 100644
--- a/tests/qemuxml2argvdata/graphics-dbus-audio.args
+++ b/tests/qemuxml2argvdata/graphics-dbus-audio.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"dbus","in":{"mixing-engine":false},"out":{"mixing-engine":false}}' \
 -display dbus,p2p=on,audiodev=audio1 \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 9b667f573c..ec3ffc1cad 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -display egl-headless \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index f1592fc5b7..11750f7473 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -27,8 +27,9 @@ DISPLAY=:0.1 \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -full-screen \
 -display sdl \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
index ffa1114f0a..5c5d373a7c 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -27,8 +27,9 @@ DISPLAY=:0.1 \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -display sdl \
 -device VGA,id=video0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index fa3ef73d7b..2a901ef650 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 -no-shutdown \
 -boot strict=on \
 -device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vhost-scsi-ccw,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,devno=fe.0.0002 \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0003 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index d322962660..88c62b1c4f 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 -boot strict=on \
 -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
 -usb \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index eb113edeeb..8b2002a986 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
index fcdf5f8aeb..a05305439e 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 03f6c3fc4f..2d9431dab1 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -36,8 +36,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -usb \
 -object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \
 -device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index f35001d39f..0264fc7da9 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -36,8 +36,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -usb \
 -object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,share=on,prealloc=on,size=536870912,host-nodes=0-3,policy=bind \
 -device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
index 37f9ae9efa..08ce2f49cd 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -34,8 +34,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
index 5de677d678..320e5f90ff 100644
--- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@@ -10,10 +10,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
 -name guest=test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
+-blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
+-machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel hvf \
--drive file=/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=pflash,format=raw,unit=0,readonly=on \
--drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 4096 \
 -overcommit mem-lock=off \
 -smp 2,sockets=2,cores=1,threads=1 \
@@ -33,8 +35,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
 -device pcie-root-port,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device pcie-root-port,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
--drive file=/var/lib/libvirt/images/test.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.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,bus=pci.3,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,addr=0x0 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
index a9b30271d4..8272c0792b 100644
--- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
@@ -32,8 +32,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
 -device pcie-root-port,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
 -device pcie-root-port,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \
--drive file=/var/lib/libvirt/images/test.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.3,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.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,bus=pci.3,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,addr=0x0 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index 286582b06d..f70425ca30 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -device usb-mouse,id=input0,bus=usb.0,port=2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
index f13ac6625a..f507078fcb 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -device usb-mouse,id=input0,bus=usb.0,port=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
index 53df43196d..7345200ba3 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.args
index a99eca6353..2f3edb5723 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -24,8 +24,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -device virtio-keyboard-ccw,id=input0,devno=fe.0.0002 \
 -device virtio-mouse-ccw,id=input1,devno=fe.0.0003 \
 -device virtio-tablet-ccw,id=input2,devno=fe.0.0004 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 4a487475d6..4bd4749d2b 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -26,10 +26,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,iothread=iothread1,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-ccw,iothread=iothread2,devno=0.0.0007,drive=drive-virtio-disk1,id=virtio-disk1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,iothread=iothread1,devno=fe.0.0000,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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-ccw,iothread=iothread2,devno=0.0.0007,drive=libvirt-1-format,id=virtio-disk1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
index 8a4109872e..ef80cf4008 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -28,11 +28,14 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
--drive file=/var/lib/libvirt/images/iothrtest1.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,id=drive-virtio-disk2 \
--device virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-3-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-3-format","read-only":false,"driver":"raw","file":"libvirt-3-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-3-format,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest1.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,iothread=iothread1,bus=pci.0,addr=0x4,drive=libvirt-2-format,id=virtio-disk1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/iothrtest2.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,iothread=iothread2,bus=pci.0,addr=0x2,drive=libvirt-1-format,id=virtio-disk2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index 5eadf315db..a20f6e68bf 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -30,7 +30,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
index f591475f10..ddb79f9bef 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -28,7 +28,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args
index e6e6e2b99b..88e6fa4906 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -28,7 +28,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
index f8cc371367..6775184baa 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
index e9cc6a7576..dddcdf719d 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index cdaa726832..aea6c825c2 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index cdaa726832..aea6c825c2 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 7987b3ed22..5fbd621003 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 7987b3ed22..5fbd621003 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
index c9f0f917a7..5e0b8b3165 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
index 670a622d1c..78edd86425 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
index 39bc2c0a6e..4029e9e1e6 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
index 1ff7a360fa..964bec75d5 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 77b3be6d58..f25dde8136 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 77b3be6d58..f25dde8136 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index bd2632e2b6..78a1edbb3a 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index bd2632e2b6..78a1edbb3a 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 83fd401afa..0f00797b16 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 83fd401afa..0f00797b16 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -24,7 +24,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index d544f88a17..bf8ef54fb9 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -24,10 +24,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0002,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-ccw,devno=fe.0.0003,drive=drive-virtio-disk1,id=virtio-disk1,bootindex=3 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0002,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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-ccw,devno=fe.0.0003,drive=libvirt-1-format,id=virtio-disk1,bootindex=3 \
 -netdev user,id=hostnet0 \
 -device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,bootindex=2,devno=fe.0.0000 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index d6a7b8faa5..deb4747e94 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -24,8 +24,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 8b411a83d2..e855102e34 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args
index aea6e71c84..ecd2a9ac12 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 00d3180c73..adab0dd027 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
 -object memory-backend-ram,id=memdimm2,size=536870912 \
 -device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index c4497f5040..90c409754f 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
 -object memory-backend-file,id=memdimm1,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \
 -device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
index d4e717e8f9..b14cd89743 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 4f67bef4ce..f308c8f364 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -incoming tcp:10.0.0.1:5000 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
index 052243cd9d..0c6045668a 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -25,7 +25,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
index 77729307bd..7eb5f2b3ab 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -27,7 +27,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -global PIIX4_PM.disable_s3=1 \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 656922aa3e..e126d93f9b 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -28,7 +28,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -global PIIX4_PM.disable_s4=1 \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
index 579d508a49..7074f8d9cb 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -27,7 +27,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -global PIIX4_PM.disable_s4=0 \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
index 052243cd9d..0c6045668a 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -25,7 +25,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
index 65e9e5db26..b6ca2f46c0 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/dev/hda1,format=qcow2,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 \
+-blockdev '{"driver":"file","filename":"/dev/hda1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 22f782a1f3..accb08bd33 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -35,8 +35,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device lsi,id=scsi7,bus=pci.0,addr=0x4.0x6 \
 -device lsi,id=scsi8,bus=pci.0,addr=0x4.0x7 \
 -usb \
--drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
--device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=libvirt-1-format,id=scsi0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
index 4ae01d8b59..648942ff78 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev socket,connect=192.168.0.1:5558,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
index 517c7d0144..4e7b0074fc 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
index 517c7d0144..4e7b0074fc 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
index b639329316..518e16039f 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -netdev tap,fd=3,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 90d9e23b31..ea329d2537 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,vhost=on,vhostfd=44,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 517c7d0144..4e7b0074fc 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev tap,fd=3,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 7467c91cd1..6475c8a3c2 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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=2 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 1dfe67a8d9..7a5a4dd91e 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index 247a7dd790..5c2e632473 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index d6ef6cc3da..f1c3722ce2 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
index 6bbb88307a..bed940c349 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
index bd8c3b07f8..d59b18933c 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
index 32d17e11d0..eec04c797f 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev socket,listen=192.168.0.1:5558,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 2100c0379d..5d8a1c3500 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
index c71817ee53..1da3cec814 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,net=172.17.2.0/24,ipv6-prefix=2001:db8:ac10:fd01::,ipv6-prefixlen=64,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index 993e9a39d4..c554f47608 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index d56a52f88e..aa6a11dcad 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
 -netdev vhost-user,chardev=charnet0,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:ee:96:6b,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
index 0f7f959a86..fba098c2af 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index c0e690254c..3170b744ab 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/dev/HostVG/QEMUGuest7,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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest7","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 768e59f5c6..0ff052c0b7 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 94849c71e6..187174874c 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index 93a7dc7037..1e779538ab 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,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 \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 9c6fb3b4e1..6a575b3b0d 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,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=0x2 \
 -netdev user,id=hostua-backup1 \
diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
index 463d2cbf2f..eb6af65948 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
index 4a448f0d7b..9cce9b3b3b 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
index 2a5455dfaf..f30ed2fed6 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index 98d424d7b3..e3d3d6f3db 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev parport,id=charparallel0,path=/dev/parport0 \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index 2066f97afb..042348b1c2 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
 -device isa-parallel,chardev=charparallel0,id=parallel0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index d3b4e9cf6f..3b27af4b71 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -32,8 +32,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
 -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x8 \
 -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0x9 \
 -usb \
--drive file=/var/iso/f18kde.iso,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 \
+-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index dbb7382918..780154952c 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -33,8 +33,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
 -device pci-bridge,chassis_nr=6,id=pci.6,bus=pci.0,addr=0x9 \
 -device pci-bridge,chassis_nr=7,id=pci.7,bus=pci.0,addr=0xa \
 -usb \
--drive file=/var/iso/f18kde.iso,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 \
+-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 98ae53988e..3314ddf387 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,readonly=on \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index c6b8e73a18..d540e79c24 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -29,215 +29,320 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-lots-of-disks/.config \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x3 \
 -device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/var/lib/libvirt/images/test.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/var/lib/libvirt/images/disk-a-a.img,format=raw,if=none,id=drive-virtio-disk26 \
--device virtio-blk-pci,bus=pci.0,addr=0x6,drive=drive-virtio-disk26,id=virtio-disk26 \
--drive file=/var/lib/libvirt/images/disk-a-b.img,format=raw,if=none,id=drive-virtio-disk27 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,id=virtio-disk27 \
--drive file=/var/lib/libvirt/images/disk-a-c.img,format=raw,if=none,id=drive-virtio-disk28 \
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,id=virtio-disk28 \
--drive file=/var/lib/libvirt/images/disk-a-d.img,format=raw,if=none,id=drive-virtio-disk29 \
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,id=virtio-disk29 \
--drive file=/var/lib/libvirt/images/disk-b-a.img,format=raw,if=none,id=drive-virtio-disk52 \
--device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,id=virtio-disk52 \
--drive file=/var/lib/libvirt/images/disk-b-b.img,format=raw,if=none,id=drive-virtio-disk53 \
--device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,id=virtio-disk53 \
--drive file=/var/lib/libvirt/images/disk-b-c.img,format=raw,if=none,id=drive-virtio-disk54 \
--device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,id=virtio-disk54 \
--drive file=/var/lib/libvirt/images/disk-b-d.img,format=raw,if=none,id=drive-virtio-disk55 \
--device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,id=virtio-disk55 \
--drive file=/var/lib/libvirt/images/disk-c-a.img,format=raw,if=none,id=drive-virtio-disk78 \
--device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,id=virtio-disk78 \
--drive file=/var/lib/libvirt/images/disk-c-b.img,format=raw,if=none,id=drive-virtio-disk79 \
--device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,id=virtio-disk79 \
--drive file=/var/lib/libvirt/images/disk-c-c.img,format=raw,if=none,id=drive-virtio-disk80 \
--device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,id=virtio-disk80 \
--drive file=/var/lib/libvirt/images/disk-c-d.img,format=raw,if=none,id=drive-virtio-disk81 \
--device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,id=virtio-disk81 \
--drive file=/var/lib/libvirt/images/disk-d-a.img,format=raw,if=none,id=drive-virtio-disk104 \
--device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,id=virtio-disk104 \
--drive file=/var/lib/libvirt/images/disk-d-b.img,format=raw,if=none,id=drive-virtio-disk105 \
--device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,id=virtio-disk105 \
--drive file=/var/lib/libvirt/images/disk-d-c.img,format=raw,if=none,id=drive-virtio-disk106 \
--device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,id=virtio-disk106 \
--drive file=/var/lib/libvirt/images/disk-d-d.img,format=raw,if=none,id=drive-virtio-disk107 \
--device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,id=virtio-disk107 \
--drive file=/var/lib/libvirt/images/disk-e-a.img,format=raw,if=none,id=drive-virtio-disk130 \
--device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,id=virtio-disk130 \
--drive file=/var/lib/libvirt/images/disk-e-b.img,format=raw,if=none,id=drive-virtio-disk131 \
--device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,id=virtio-disk131 \
--drive file=/var/lib/libvirt/images/disk-e-c.img,format=raw,if=none,id=drive-virtio-disk132 \
--device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,id=virtio-disk132 \
--drive file=/var/lib/libvirt/images/disk-e-d.img,format=raw,if=none,id=drive-virtio-disk133 \
--device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,id=virtio-disk133 \
--drive file=/var/lib/libvirt/images/disk-f-a.img,format=raw,if=none,id=drive-virtio-disk156 \
--device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,id=virtio-disk156 \
--drive file=/var/lib/libvirt/images/disk-f-b.img,format=raw,if=none,id=drive-virtio-disk157 \
--device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,id=virtio-disk157 \
--drive file=/var/lib/libvirt/images/disk-f-c.img,format=raw,if=none,id=drive-virtio-disk158 \
--device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,id=virtio-disk158 \
--drive file=/var/lib/libvirt/images/disk-f-d.img,format=raw,if=none,id=drive-virtio-disk159 \
--device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,id=virtio-disk159 \
--drive file=/var/lib/libvirt/images/disk-g-a.img,format=raw,if=none,id=drive-virtio-disk182 \
--device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \
--drive file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
--device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \
--drive file=/var/lib/libvirt/images/disk-g-c.img,format=raw,if=none,id=drive-virtio-disk184 \
--device virtio-blk-pci,bus=pci.1,addr=0x1,drive=drive-virtio-disk184,id=virtio-disk184 \
--drive file=/var/lib/libvirt/images/disk-g-d.img,format=raw,if=none,id=drive-virtio-disk185 \
--device virtio-blk-pci,bus=pci.1,addr=0x2,drive=drive-virtio-disk185,id=virtio-disk185 \
--drive file=/var/lib/libvirt/images/disk-h-a.img,format=raw,if=none,id=drive-virtio-disk208 \
--device virtio-blk-pci,bus=pci.1,addr=0x3,drive=drive-virtio-disk208,id=virtio-disk208 \
--drive file=/var/lib/libvirt/images/disk-h-b.img,format=raw,if=none,id=drive-virtio-disk209 \
--device virtio-blk-pci,bus=pci.1,addr=0x4,drive=drive-virtio-disk209,id=virtio-disk209 \
--drive file=/var/lib/libvirt/images/disk-h-c.img,format=raw,if=none,id=drive-virtio-disk210 \
--device virtio-blk-pci,bus=pci.1,addr=0x5,drive=drive-virtio-disk210,id=virtio-disk210 \
--drive file=/var/lib/libvirt/images/disk-h-d.img,format=raw,if=none,id=drive-virtio-disk211 \
--device virtio-blk-pci,bus=pci.1,addr=0x6,drive=drive-virtio-disk211,id=virtio-disk211 \
--drive file=/var/lib/libvirt/images/disk-i-a.img,format=raw,if=none,id=drive-virtio-disk234 \
--device virtio-blk-pci,bus=pci.1,addr=0x7,drive=drive-virtio-disk234,id=virtio-disk234 \
--drive file=/var/lib/libvirt/images/disk-i-b.img,format=raw,if=none,id=drive-virtio-disk235 \
--device virtio-blk-pci,bus=pci.1,addr=0x8,drive=drive-virtio-disk235,id=virtio-disk235 \
--drive file=/var/lib/libvirt/images/disk-i-c.img,format=raw,if=none,id=drive-virtio-disk236 \
--device virtio-blk-pci,bus=pci.1,addr=0x9,drive=drive-virtio-disk236,id=virtio-disk236 \
--drive file=/var/lib/libvirt/images/disk-i-d.img,format=raw,if=none,id=drive-virtio-disk237 \
--device virtio-blk-pci,bus=pci.1,addr=0xa,drive=drive-virtio-disk237,id=virtio-disk237 \
--drive file=/var/lib/libvirt/images/disk-j-a.img,format=raw,if=none,id=drive-virtio-disk260 \
--device virtio-blk-pci,bus=pci.1,addr=0xb,drive=drive-virtio-disk260,id=virtio-disk260 \
--drive file=/var/lib/libvirt/images/disk-j-b.img,format=raw,if=none,id=drive-virtio-disk261 \
--device virtio-blk-pci,bus=pci.1,addr=0xc,drive=drive-virtio-disk261,id=virtio-disk261 \
--drive file=/var/lib/libvirt/images/disk-j-c.img,format=raw,if=none,id=drive-virtio-disk262 \
--device virtio-blk-pci,bus=pci.1,addr=0xd,drive=drive-virtio-disk262,id=virtio-disk262 \
--drive file=/var/lib/libvirt/images/disk-j-d.img,format=raw,if=none,id=drive-virtio-disk263 \
--device virtio-blk-pci,bus=pci.1,addr=0xe,drive=drive-virtio-disk263,id=virtio-disk263 \
--drive file=/var/lib/libvirt/images/disk-k-a.img,format=raw,if=none,id=drive-virtio-disk286 \
--device virtio-blk-pci,bus=pci.1,addr=0xf,drive=drive-virtio-disk286,id=virtio-disk286 \
--drive file=/var/lib/libvirt/images/disk-k-b.img,format=raw,if=none,id=drive-virtio-disk287 \
--device virtio-blk-pci,bus=pci.1,addr=0x10,drive=drive-virtio-disk287,id=virtio-disk287 \
--drive file=/var/lib/libvirt/images/disk-k-c.img,format=raw,if=none,id=drive-virtio-disk288 \
--device virtio-blk-pci,bus=pci.1,addr=0x11,drive=drive-virtio-disk288,id=virtio-disk288 \
--drive file=/var/lib/libvirt/images/disk-k-d.img,format=raw,if=none,id=drive-virtio-disk289 \
--device virtio-blk-pci,bus=pci.1,addr=0x12,drive=drive-virtio-disk289,id=virtio-disk289 \
--drive file=/var/lib/libvirt/images/disk-l-a.img,format=raw,if=none,id=drive-virtio-disk312 \
--device virtio-blk-pci,bus=pci.1,addr=0x13,drive=drive-virtio-disk312,id=virtio-disk312 \
--drive file=/var/lib/libvirt/images/disk-l-b.img,format=raw,if=none,id=drive-virtio-disk313 \
--device virtio-blk-pci,bus=pci.1,addr=0x14,drive=drive-virtio-disk313,id=virtio-disk313 \
--drive file=/var/lib/libvirt/images/disk-l-c.img,format=raw,if=none,id=drive-virtio-disk314 \
--device virtio-blk-pci,bus=pci.1,addr=0x15,drive=drive-virtio-disk314,id=virtio-disk314 \
--drive file=/var/lib/libvirt/images/disk-l-d.img,format=raw,if=none,id=drive-virtio-disk315 \
--device virtio-blk-pci,bus=pci.1,addr=0x16,drive=drive-virtio-disk315,id=virtio-disk315 \
--drive file=/var/lib/libvirt/images/disk-m-a.img,format=raw,if=none,id=drive-virtio-disk338 \
--device virtio-blk-pci,bus=pci.1,addr=0x17,drive=drive-virtio-disk338,id=virtio-disk338 \
--drive file=/var/lib/libvirt/images/disk-m-b.img,format=raw,if=none,id=drive-virtio-disk339 \
--device virtio-blk-pci,bus=pci.1,addr=0x18,drive=drive-virtio-disk339,id=virtio-disk339 \
--drive file=/var/lib/libvirt/images/disk-m-c.img,format=raw,if=none,id=drive-virtio-disk340 \
--device virtio-blk-pci,bus=pci.1,addr=0x19,drive=drive-virtio-disk340,id=virtio-disk340 \
--drive file=/var/lib/libvirt/images/disk-m-d.img,format=raw,if=none,id=drive-virtio-disk341 \
--device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=drive-virtio-disk341,id=virtio-disk341 \
--drive file=/var/lib/libvirt/images/disk-n-a.img,format=raw,if=none,id=drive-virtio-disk364 \
--device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=drive-virtio-disk364,id=virtio-disk364 \
--drive file=/var/lib/libvirt/images/disk-n-b.img,format=raw,if=none,id=drive-virtio-disk365 \
--device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=drive-virtio-disk365,id=virtio-disk365 \
--drive file=/var/lib/libvirt/images/disk-n-c.img,format=raw,if=none,id=drive-virtio-disk366 \
--device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=drive-virtio-disk366,id=virtio-disk366 \
--drive file=/var/lib/libvirt/images/disk-n-d.img,format=raw,if=none,id=drive-virtio-disk367 \
--device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=drive-virtio-disk367,id=virtio-disk367 \
--drive file=/var/lib/libvirt/images/disk-o-a.img,format=raw,if=none,id=drive-virtio-disk390 \
--device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=drive-virtio-disk390,id=virtio-disk390 \
--drive file=/var/lib/libvirt/images/disk-o-b.img,format=raw,if=none,id=drive-virtio-disk391 \
--device virtio-blk-pci,bus=pci.2,addr=0x1,drive=drive-virtio-disk391,id=virtio-disk391 \
--drive file=/var/lib/libvirt/images/disk-o-c.img,format=raw,if=none,id=drive-virtio-disk392 \
--device virtio-blk-pci,bus=pci.2,addr=0x2,drive=drive-virtio-disk392,id=virtio-disk392 \
--drive file=/var/lib/libvirt/images/disk-o-d.img,format=raw,if=none,id=drive-virtio-disk393 \
--device virtio-blk-pci,bus=pci.2,addr=0x3,drive=drive-virtio-disk393,id=virtio-disk393 \
--drive file=/var/lib/libvirt/images/disk-p-a.img,format=raw,if=none,id=drive-virtio-disk416 \
--device virtio-blk-pci,bus=pci.2,addr=0x4,drive=drive-virtio-disk416,id=virtio-disk416 \
--drive file=/var/lib/libvirt/images/disk-p-b.img,format=raw,if=none,id=drive-virtio-disk417 \
--device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk417,id=virtio-disk417 \
--drive file=/var/lib/libvirt/images/disk-p-c.img,format=raw,if=none,id=drive-virtio-disk418 \
--device virtio-blk-pci,bus=pci.2,addr=0x6,drive=drive-virtio-disk418,id=virtio-disk418 \
--drive file=/var/lib/libvirt/images/disk-p-d.img,format=raw,if=none,id=drive-virtio-disk419 \
--device virtio-blk-pci,bus=pci.2,addr=0x7,drive=drive-virtio-disk419,id=virtio-disk419 \
--drive file=/var/lib/libvirt/images/disk-q-a.img,format=raw,if=none,id=drive-virtio-disk442 \
--device virtio-blk-pci,bus=pci.2,addr=0x8,drive=drive-virtio-disk442,id=virtio-disk442 \
--drive file=/var/lib/libvirt/images/disk-q-b.img,format=raw,if=none,id=drive-virtio-disk443 \
--device virtio-blk-pci,bus=pci.2,addr=0x9,drive=drive-virtio-disk443,id=virtio-disk443 \
--drive file=/var/lib/libvirt/images/disk-q-c.img,format=raw,if=none,id=drive-virtio-disk444 \
--device virtio-blk-pci,bus=pci.2,addr=0xa,drive=drive-virtio-disk444,id=virtio-disk444 \
--drive file=/var/lib/libvirt/images/disk-q-d.img,format=raw,if=none,id=drive-virtio-disk445 \
--device virtio-blk-pci,bus=pci.2,addr=0xb,drive=drive-virtio-disk445,id=virtio-disk445 \
--drive file=/var/lib/libvirt/images/disk-r-a.img,format=raw,if=none,id=drive-virtio-disk468 \
--device virtio-blk-pci,bus=pci.2,addr=0xc,drive=drive-virtio-disk468,id=virtio-disk468 \
--drive file=/var/lib/libvirt/images/disk-r-b.img,format=raw,if=none,id=drive-virtio-disk469 \
--device virtio-blk-pci,bus=pci.2,addr=0xd,drive=drive-virtio-disk469,id=virtio-disk469 \
--drive file=/var/lib/libvirt/images/disk-r-c.img,format=raw,if=none,id=drive-virtio-disk470 \
--device virtio-blk-pci,bus=pci.2,addr=0xe,drive=drive-virtio-disk470,id=virtio-disk470 \
--drive file=/var/lib/libvirt/images/disk-r-d.img,format=raw,if=none,id=drive-virtio-disk471 \
--device virtio-blk-pci,bus=pci.2,addr=0xf,drive=drive-virtio-disk471,id=virtio-disk471 \
--drive file=/var/lib/libvirt/images/disk-s-a.img,format=raw,if=none,id=drive-virtio-disk494 \
--device virtio-blk-pci,bus=pci.2,addr=0x10,drive=drive-virtio-disk494,id=virtio-disk494 \
--drive file=/var/lib/libvirt/images/disk-s-b.img,format=raw,if=none,id=drive-virtio-disk495 \
--device virtio-blk-pci,bus=pci.2,addr=0x11,drive=drive-virtio-disk495,id=virtio-disk495 \
--drive file=/var/lib/libvirt/images/disk-s-c.img,format=raw,if=none,id=drive-virtio-disk496 \
--device virtio-blk-pci,bus=pci.2,addr=0x12,drive=drive-virtio-disk496,id=virtio-disk496 \
--drive file=/var/lib/libvirt/images/disk-s-d.img,format=raw,if=none,id=drive-virtio-disk497 \
--device virtio-blk-pci,bus=pci.2,addr=0x13,drive=drive-virtio-disk497,id=virtio-disk497 \
--drive file=/var/lib/libvirt/images/disk-t-a.img,format=raw,if=none,id=drive-virtio-disk520 \
--device virtio-blk-pci,bus=pci.2,addr=0x14,drive=drive-virtio-disk520,id=virtio-disk520 \
--drive file=/var/lib/libvirt/images/disk-t-b.img,format=raw,if=none,id=drive-virtio-disk521 \
--device virtio-blk-pci,bus=pci.2,addr=0x15,drive=drive-virtio-disk521,id=virtio-disk521 \
--drive file=/var/lib/libvirt/images/disk-t-c.img,format=raw,if=none,id=drive-virtio-disk522 \
--device virtio-blk-pci,bus=pci.2,addr=0x16,drive=drive-virtio-disk522,id=virtio-disk522 \
--drive file=/var/lib/libvirt/images/disk-t-d.img,format=raw,if=none,id=drive-virtio-disk523 \
--device virtio-blk-pci,bus=pci.2,addr=0x17,drive=drive-virtio-disk523,id=virtio-disk523 \
--drive file=/var/lib/libvirt/images/disk-u-a.img,format=raw,if=none,id=drive-virtio-disk546 \
--device virtio-blk-pci,bus=pci.2,addr=0x18,drive=drive-virtio-disk546,id=virtio-disk546 \
--drive file=/var/lib/libvirt/images/disk-u-b.img,format=raw,if=none,id=drive-virtio-disk547 \
--device virtio-blk-pci,bus=pci.2,addr=0x19,drive=drive-virtio-disk547,id=virtio-disk547 \
--drive file=/var/lib/libvirt/images/disk-u-c.img,format=raw,if=none,id=drive-virtio-disk548 \
--device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=drive-virtio-disk548,id=virtio-disk548 \
--drive file=/var/lib/libvirt/images/disk-u-d.img,format=raw,if=none,id=drive-virtio-disk549 \
--device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=drive-virtio-disk549,id=virtio-disk549 \
--drive file=/var/lib/libvirt/images/disk-v-a.img,format=raw,if=none,id=drive-virtio-disk572 \
--device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=drive-virtio-disk572,id=virtio-disk572 \
--drive file=/var/lib/libvirt/images/disk-v-b.img,format=raw,if=none,id=drive-virtio-disk573 \
--device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=drive-virtio-disk573,id=virtio-disk573 \
--drive file=/var/lib/libvirt/images/disk-v-c.img,format=raw,if=none,id=drive-virtio-disk574 \
--device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=drive-virtio-disk574,id=virtio-disk574 \
--drive file=/var/lib/libvirt/images/disk-v-d.img,format=raw,if=none,id=drive-virtio-disk575 \
--device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=drive-virtio-disk575,id=virtio-disk575 \
--drive file=/var/lib/libvirt/images/disk-w-a.img,format=raw,if=none,id=drive-virtio-disk598 \
--device virtio-blk-pci,bus=pci.3,addr=0x1,drive=drive-virtio-disk598,id=virtio-disk598 \
--drive file=/var/lib/libvirt/images/disk-w-b.img,format=raw,if=none,id=drive-virtio-disk599 \
--device virtio-blk-pci,bus=pci.3,addr=0x2,drive=drive-virtio-disk599,id=virtio-disk599 \
--drive file=/var/lib/libvirt/images/disk-w-c.img,format=raw,if=none,id=drive-virtio-disk600 \
--device virtio-blk-pci,bus=pci.3,addr=0x3,drive=drive-virtio-disk600,id=virtio-disk600 \
--drive file=/var/lib/libvirt/images/disk-w-d.img,format=raw,if=none,id=drive-virtio-disk601 \
--device virtio-blk-pci,bus=pci.3,addr=0x4,drive=drive-virtio-disk601,id=virtio-disk601 \
--drive file=/var/lib/libvirt/images/disk-x-a.img,format=raw,if=none,id=drive-virtio-disk624 \
--device virtio-blk-pci,bus=pci.3,addr=0x5,drive=drive-virtio-disk624,id=virtio-disk624 \
--drive file=/var/lib/libvirt/images/disk-x-b.img,format=raw,if=none,id=drive-virtio-disk625 \
--device virtio-blk-pci,bus=pci.3,addr=0x6,drive=drive-virtio-disk625,id=virtio-disk625 \
--drive file=/var/lib/libvirt/images/disk-x-c.img,format=raw,if=none,id=drive-virtio-disk626 \
--device virtio-blk-pci,bus=pci.3,addr=0x7,drive=drive-virtio-disk626,id=virtio-disk626 \
--drive file=/var/lib/libvirt/images/disk-x-d.img,format=raw,if=none,id=drive-virtio-disk627 \
--device virtio-blk-pci,bus=pci.3,addr=0x8,drive=drive-virtio-disk627,id=virtio-disk627 \
--drive file=/var/lib/libvirt/images/disk-y-a.img,format=raw,if=none,id=drive-virtio-disk650 \
--device virtio-blk-pci,bus=pci.3,addr=0x9,drive=drive-virtio-disk650,id=virtio-disk650 \
--drive file=/var/lib/libvirt/images/disk-y-b.img,format=raw,if=none,id=drive-virtio-disk651 \
--device virtio-blk-pci,bus=pci.3,addr=0xa,drive=drive-virtio-disk651,id=virtio-disk651 \
--drive file=/var/lib/libvirt/images/disk-y-c.img,format=raw,if=none,id=drive-virtio-disk652 \
--device virtio-blk-pci,bus=pci.3,addr=0xb,drive=drive-virtio-disk652,id=virtio-disk652 \
--drive file=/var/lib/libvirt/images/disk-y-d.img,format=raw,if=none,id=drive-virtio-disk653 \
--device virtio-blk-pci,bus=pci.3,addr=0xc,drive=drive-virtio-disk653,id=virtio-disk653 \
--drive file=/var/lib/libvirt/images/disk-z-a.img,format=raw,if=none,id=drive-virtio-disk676 \
--device virtio-blk-pci,bus=pci.3,addr=0xd,drive=drive-virtio-disk676,id=virtio-disk676 \
--drive file=/var/lib/libvirt/images/disk-z-b.img,format=raw,if=none,id=drive-virtio-disk677 \
--device virtio-blk-pci,bus=pci.3,addr=0xe,drive=drive-virtio-disk677,id=virtio-disk677 \
--drive file=/var/lib/libvirt/images/disk-z-c.img,format=raw,if=none,id=drive-virtio-disk678 \
--device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk678,id=virtio-disk678 \
--drive file=/var/lib/libvirt/images/disk-z-d.img,format=raw,if=none,id=drive-virtio-disk679 \
--device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk679,id=virtio-disk679 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-105-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-105-format","read-only":false,"driver":"raw","file":"libvirt-105-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-105-format,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.img","node-name":"libvirt-104-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-104-format","read-only":false,"driver":"raw","file":"libvirt-104-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x6,drive=libvirt-104-format,id=virtio-disk26 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.img","node-name":"libvirt-103-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-103-format","read-only":false,"driver":"raw","file":"libvirt-103-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-103-format,id=virtio-disk27 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.img","node-name":"libvirt-102-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-102-format","read-only":false,"driver":"raw","file":"libvirt-102-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-102-format,id=virtio-disk28 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.img","node-name":"libvirt-101-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-101-format","read-only":false,"driver":"raw","file":"libvirt-101-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-101-format,id=virtio-disk29 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.img","node-name":"libvirt-100-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-100-format","read-only":false,"driver":"raw","file":"libvirt-100-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=libvirt-100-format,id=virtio-disk52 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.img","node-name":"libvirt-99-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-99-format","read-only":false,"driver":"raw","file":"libvirt-99-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=libvirt-99-format,id=virtio-disk53 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.img","node-name":"libvirt-98-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-98-format","read-only":false,"driver":"raw","file":"libvirt-98-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=libvirt-98-format,id=virtio-disk54 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.img","node-name":"libvirt-97-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-97-format","read-only":false,"driver":"raw","file":"libvirt-97-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=libvirt-97-format,id=virtio-disk55 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.img","node-name":"libvirt-96-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-96-format","read-only":false,"driver":"raw","file":"libvirt-96-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=libvirt-96-format,id=virtio-disk78 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.img","node-name":"libvirt-95-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-95-format","read-only":false,"driver":"raw","file":"libvirt-95-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=libvirt-95-format,id=virtio-disk79 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.img","node-name":"libvirt-94-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-94-format","read-only":false,"driver":"raw","file":"libvirt-94-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=libvirt-94-format,id=virtio-disk80 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.img","node-name":"libvirt-93-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-93-format","read-only":false,"driver":"raw","file":"libvirt-93-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=libvirt-93-format,id=virtio-disk81 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.img","node-name":"libvirt-92-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-92-format","read-only":false,"driver":"raw","file":"libvirt-92-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=libvirt-92-format,id=virtio-disk104 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.img","node-name":"libvirt-91-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-91-format","read-only":false,"driver":"raw","file":"libvirt-91-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=libvirt-91-format,id=virtio-disk105 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.img","node-name":"libvirt-90-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-90-format","read-only":false,"driver":"raw","file":"libvirt-90-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=libvirt-90-format,id=virtio-disk106 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.img","node-name":"libvirt-89-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-89-format","read-only":false,"driver":"raw","file":"libvirt-89-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=libvirt-89-format,id=virtio-disk107 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.img","node-name":"libvirt-88-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-88-format","read-only":false,"driver":"raw","file":"libvirt-88-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=libvirt-88-format,id=virtio-disk130 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.img","node-name":"libvirt-87-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-87-format","read-only":false,"driver":"raw","file":"libvirt-87-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=libvirt-87-format,id=virtio-disk131 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.img","node-name":"libvirt-86-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-86-format","read-only":false,"driver":"raw","file":"libvirt-86-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=libvirt-86-format,id=virtio-disk132 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.img","node-name":"libvirt-85-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-85-format","read-only":false,"driver":"raw","file":"libvirt-85-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=libvirt-85-format,id=virtio-disk133 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.img","node-name":"libvirt-84-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-84-format","read-only":false,"driver":"raw","file":"libvirt-84-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=libvirt-84-format,id=virtio-disk156 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.img","node-name":"libvirt-83-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-83-format","read-only":false,"driver":"raw","file":"libvirt-83-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=libvirt-83-format,id=virtio-disk157 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.img","node-name":"libvirt-82-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-82-format","read-only":false,"driver":"raw","file":"libvirt-82-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=libvirt-82-format,id=virtio-disk158 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.img","node-name":"libvirt-81-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-81-format","read-only":false,"driver":"raw","file":"libvirt-81-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=libvirt-81-format,id=virtio-disk159 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.img","node-name":"libvirt-80-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-80-format","read-only":false,"driver":"raw","file":"libvirt-80-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=libvirt-80-format,id=virtio-disk182 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.img","node-name":"libvirt-79-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-79-format","read-only":false,"driver":"raw","file":"libvirt-79-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=libvirt-79-format,id=virtio-disk183 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-c.img","node-name":"libvirt-78-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-78-format","read-only":false,"driver":"raw","file":"libvirt-78-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1,drive=libvirt-78-format,id=virtio-disk184 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-d.img","node-name":"libvirt-77-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-77-format","read-only":false,"driver":"raw","file":"libvirt-77-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x2,drive=libvirt-77-format,id=virtio-disk185 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-a.img","node-name":"libvirt-76-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-76-format","read-only":false,"driver":"raw","file":"libvirt-76-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x3,drive=libvirt-76-format,id=virtio-disk208 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-b.img","node-name":"libvirt-75-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-75-format","read-only":false,"driver":"raw","file":"libvirt-75-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x4,drive=libvirt-75-format,id=virtio-disk209 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-c.img","node-name":"libvirt-74-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-74-format","read-only":false,"driver":"raw","file":"libvirt-74-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x5,drive=libvirt-74-format,id=virtio-disk210 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-h-d.img","node-name":"libvirt-73-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-73-format","read-only":false,"driver":"raw","file":"libvirt-73-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x6,drive=libvirt-73-format,id=virtio-disk211 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-a.img","node-name":"libvirt-72-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-72-format","read-only":false,"driver":"raw","file":"libvirt-72-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x7,drive=libvirt-72-format,id=virtio-disk234 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-b.img","node-name":"libvirt-71-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-71-format","read-only":false,"driver":"raw","file":"libvirt-71-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x8,drive=libvirt-71-format,id=virtio-disk235 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-c.img","node-name":"libvirt-70-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-70-format","read-only":false,"driver":"raw","file":"libvirt-70-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x9,drive=libvirt-70-format,id=virtio-disk236 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-i-d.img","node-name":"libvirt-69-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-69-format","read-only":false,"driver":"raw","file":"libvirt-69-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0xa,drive=libvirt-69-format,id=virtio-disk237 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-a.img","node-name":"libvirt-68-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-68-format","read-only":false,"driver":"raw","file":"libvirt-68-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0xb,drive=libvirt-68-format,id=virtio-disk260 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-b.img","node-name":"libvirt-67-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-67-format","read-only":false,"driver":"raw","file":"libvirt-67-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0xc,drive=libvirt-67-format,id=virtio-disk261 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-c.img","node-name":"libvirt-66-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-66-format","read-only":false,"driver":"raw","file":"libvirt-66-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0xd,drive=libvirt-66-format,id=virtio-disk262 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-j-d.img","node-name":"libvirt-65-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-65-format","read-only":false,"driver":"raw","file":"libvirt-65-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0xe,drive=libvirt-65-format,id=virtio-disk263 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-a.img","node-name":"libvirt-64-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-64-format","read-only":false,"driver":"raw","file":"libvirt-64-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0xf,drive=libvirt-64-format,id=virtio-disk286 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-b.img","node-name":"libvirt-63-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-63-format","read-only":false,"driver":"raw","file":"libvirt-63-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x10,drive=libvirt-63-format,id=virtio-disk287 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-c.img","node-name":"libvirt-62-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-62-format","read-only":false,"driver":"raw","file":"libvirt-62-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x11,drive=libvirt-62-format,id=virtio-disk288 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-k-d.img","node-name":"libvirt-61-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-61-format","read-only":false,"driver":"raw","file":"libvirt-61-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x12,drive=libvirt-61-format,id=virtio-disk289 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-a.img","node-name":"libvirt-60-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-60-format","read-only":false,"driver":"raw","file":"libvirt-60-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x13,drive=libvirt-60-format,id=virtio-disk312 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-b.img","node-name":"libvirt-59-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-59-format","read-only":false,"driver":"raw","file":"libvirt-59-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x14,drive=libvirt-59-format,id=virtio-disk313 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-c.img","node-name":"libvirt-58-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-58-format","read-only":false,"driver":"raw","file":"libvirt-58-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x15,drive=libvirt-58-format,id=virtio-disk314 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-l-d.img","node-name":"libvirt-57-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-57-format","read-only":false,"driver":"raw","file":"libvirt-57-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x16,drive=libvirt-57-format,id=virtio-disk315 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-a.img","node-name":"libvirt-56-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-56-format","read-only":false,"driver":"raw","file":"libvirt-56-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x17,drive=libvirt-56-format,id=virtio-disk338 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-b.img","node-name":"libvirt-55-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-55-format","read-only":false,"driver":"raw","file":"libvirt-55-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x18,drive=libvirt-55-format,id=virtio-disk339 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-c.img","node-name":"libvirt-54-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-54-format","read-only":false,"driver":"raw","file":"libvirt-54-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x19,drive=libvirt-54-format,id=virtio-disk340 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-m-d.img","node-name":"libvirt-53-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-53-format","read-only":false,"driver":"raw","file":"libvirt-53-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1a,drive=libvirt-53-format,id=virtio-disk341 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-a.img","node-name":"libvirt-52-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-52-format","read-only":false,"driver":"raw","file":"libvirt-52-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1b,drive=libvirt-52-format,id=virtio-disk364 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-b.img","node-name":"libvirt-51-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-51-format","read-only":false,"driver":"raw","file":"libvirt-51-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1c,drive=libvirt-51-format,id=virtio-disk365 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-c.img","node-name":"libvirt-50-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-50-format","read-only":false,"driver":"raw","file":"libvirt-50-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1d,drive=libvirt-50-format,id=virtio-disk366 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-n-d.img","node-name":"libvirt-49-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-49-format","read-only":false,"driver":"raw","file":"libvirt-49-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1e,drive=libvirt-49-format,id=virtio-disk367 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-a.img","node-name":"libvirt-48-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-48-format","read-only":false,"driver":"raw","file":"libvirt-48-storage"}' \
+-device virtio-blk-pci,bus=pci.1,addr=0x1f,drive=libvirt-48-format,id=virtio-disk390 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-b.img","node-name":"libvirt-47-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-47-format","read-only":false,"driver":"raw","file":"libvirt-47-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1,drive=libvirt-47-format,id=virtio-disk391 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-c.img","node-name":"libvirt-46-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-46-format","read-only":false,"driver":"raw","file":"libvirt-46-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x2,drive=libvirt-46-format,id=virtio-disk392 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-o-d.img","node-name":"libvirt-45-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-45-format","read-only":false,"driver":"raw","file":"libvirt-45-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x3,drive=libvirt-45-format,id=virtio-disk393 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-a.img","node-name":"libvirt-44-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-44-format","read-only":false,"driver":"raw","file":"libvirt-44-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x4,drive=libvirt-44-format,id=virtio-disk416 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-b.img","node-name":"libvirt-43-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-43-format","read-only":false,"driver":"raw","file":"libvirt-43-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x5,drive=libvirt-43-format,id=virtio-disk417 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-c.img","node-name":"libvirt-42-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-42-format","read-only":false,"driver":"raw","file":"libvirt-42-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x6,drive=libvirt-42-format,id=virtio-disk418 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-p-d.img","node-name":"libvirt-41-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-41-format","read-only":false,"driver":"raw","file":"libvirt-41-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x7,drive=libvirt-41-format,id=virtio-disk419 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-a.img","node-name":"libvirt-40-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-40-format","read-only":false,"driver":"raw","file":"libvirt-40-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x8,drive=libvirt-40-format,id=virtio-disk442 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-b.img","node-name":"libvirt-39-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-39-format","read-only":false,"driver":"raw","file":"libvirt-39-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x9,drive=libvirt-39-format,id=virtio-disk443 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-c.img","node-name":"libvirt-38-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-38-format","read-only":false,"driver":"raw","file":"libvirt-38-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0xa,drive=libvirt-38-format,id=virtio-disk444 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-q-d.img","node-name":"libvirt-37-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-37-format","read-only":false,"driver":"raw","file":"libvirt-37-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0xb,drive=libvirt-37-format,id=virtio-disk445 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-a.img","node-name":"libvirt-36-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-36-format","read-only":false,"driver":"raw","file":"libvirt-36-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0xc,drive=libvirt-36-format,id=virtio-disk468 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-b.img","node-name":"libvirt-35-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-35-format","read-only":false,"driver":"raw","file":"libvirt-35-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0xd,drive=libvirt-35-format,id=virtio-disk469 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-c.img","node-name":"libvirt-34-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-34-format","read-only":false,"driver":"raw","file":"libvirt-34-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0xe,drive=libvirt-34-format,id=virtio-disk470 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-r-d.img","node-name":"libvirt-33-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-33-format","read-only":false,"driver":"raw","file":"libvirt-33-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0xf,drive=libvirt-33-format,id=virtio-disk471 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-a.img","node-name":"libvirt-32-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-32-format","read-only":false,"driver":"raw","file":"libvirt-32-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x10,drive=libvirt-32-format,id=virtio-disk494 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-b.img","node-name":"libvirt-31-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-31-format","read-only":false,"driver":"raw","file":"libvirt-31-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x11,drive=libvirt-31-format,id=virtio-disk495 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-c.img","node-name":"libvirt-30-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-30-format","read-only":false,"driver":"raw","file":"libvirt-30-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x12,drive=libvirt-30-format,id=virtio-disk496 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-s-d.img","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-29-format","read-only":false,"driver":"raw","file":"libvirt-29-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x13,drive=libvirt-29-format,id=virtio-disk497 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-a.img","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"raw","file":"libvirt-28-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x14,drive=libvirt-28-format,id=virtio-disk520 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-b.img","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"raw","file":"libvirt-27-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x15,drive=libvirt-27-format,id=virtio-disk521 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-c.img","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"raw","file":"libvirt-26-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x16,drive=libvirt-26-format,id=virtio-disk522 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-t-d.img","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"raw","file":"libvirt-25-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x17,drive=libvirt-25-format,id=virtio-disk523 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-a.img","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"raw","file":"libvirt-24-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x18,drive=libvirt-24-format,id=virtio-disk546 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-b.img","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"raw","file":"libvirt-23-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x19,drive=libvirt-23-format,id=virtio-disk547 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-c.img","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"raw","file":"libvirt-22-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1a,drive=libvirt-22-format,id=virtio-disk548 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-u-d.img","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"raw","file":"libvirt-21-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1b,drive=libvirt-21-format,id=virtio-disk549 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-a.img","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"raw","file":"libvirt-20-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1c,drive=libvirt-20-format,id=virtio-disk572 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-b.img","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"raw","file":"libvirt-19-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1d,drive=libvirt-19-format,id=virtio-disk573 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-c.img","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"raw","file":"libvirt-18-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1e,drive=libvirt-18-format,id=virtio-disk574 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-v-d.img","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"raw","file":"libvirt-17-storage"}' \
+-device virtio-blk-pci,bus=pci.2,addr=0x1f,drive=libvirt-17-format,id=virtio-disk575 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-a.img","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"raw","file":"libvirt-16-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x1,drive=libvirt-16-format,id=virtio-disk598 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-b.img","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"raw","file":"libvirt-15-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x2,drive=libvirt-15-format,id=virtio-disk599 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-c.img","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"raw","file":"libvirt-14-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x3,drive=libvirt-14-format,id=virtio-disk600 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-w-d.img","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"raw","file":"libvirt-13-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x4,drive=libvirt-13-format,id=virtio-disk601 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-a.img","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"raw","file":"libvirt-12-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x5,drive=libvirt-12-format,id=virtio-disk624 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-b.img","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"raw","file":"libvirt-11-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x6,drive=libvirt-11-format,id=virtio-disk625 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-c.img","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"raw","file":"libvirt-10-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x7,drive=libvirt-10-format,id=virtio-disk626 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-x-d.img","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw","file":"libvirt-9-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x8,drive=libvirt-9-format,id=virtio-disk627 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-a.img","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw","file":"libvirt-8-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0x9,drive=libvirt-8-format,id=virtio-disk650 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-b.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0xa,drive=libvirt-7-format,id=virtio-disk651 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-c.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0xb,drive=libvirt-6-format,id=virtio-disk652 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-y-d.img","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \
+-device virtio-blk-pci,bus=pci.3,addr=0xc,drive=libvirt-5-format,id=virtio-disk653 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-a.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,bus=pci.3,addr=0xd,drive=libvirt-4-format,id=virtio-disk676 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-b.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,bus=pci.3,addr=0xe,drive=libvirt-3-format,id=virtio-disk677 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-c.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,bus=pci.3,addr=0xf,drive=libvirt-2-format,id=virtio-disk678 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-z-d.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,bus=pci.3,addr=0x10,drive=libvirt-1-format,id=virtio-disk679 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index c25780ab64..21c35f6577 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
 -device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
 -device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
 -usb \
--drive file=/var/iso/f18kde.iso,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 \
+-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \
 -netdev user,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.0,addr=0x5 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 8293f0ba02..b749325e55 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -25,64 +25,93 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
 -no-shutdown \
 -boot strict=on \
 -usb \
--drive file=/var/iso/f18kde.iso,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=/var/lib/libvirt/images/test.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
--drive file=/var/lib/libvirt/images/test1.img,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1 \
--drive file=/var/lib/libvirt/images/disk-a-a.img,format=raw,if=none,id=drive-virtio-disk26 \
--device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk26,id=virtio-disk26 \
--drive file=/var/lib/libvirt/images/disk-a-b.img,format=raw,if=none,id=drive-virtio-disk27 \
--device virtio-blk-pci,bus=pci.0,addr=0x7,drive=drive-virtio-disk27,id=virtio-disk27 \
--drive file=/var/lib/libvirt/images/disk-a-c.img,format=raw,if=none,id=drive-virtio-disk28 \
--device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk28,id=virtio-disk28 \
--drive file=/var/lib/libvirt/images/disk-a-d.img,format=raw,if=none,id=drive-virtio-disk29 \
--device virtio-blk-pci,bus=pci.0,addr=0x9,drive=drive-virtio-disk29,id=virtio-disk29 \
--drive file=/var/lib/libvirt/images/disk-b-a.img,format=raw,if=none,id=drive-virtio-disk52 \
--device virtio-blk-pci,bus=pci.0,addr=0xa,drive=drive-virtio-disk52,id=virtio-disk52 \
--drive file=/var/lib/libvirt/images/disk-b-b.img,format=raw,if=none,id=drive-virtio-disk53 \
--device virtio-blk-pci,bus=pci.0,addr=0xb,drive=drive-virtio-disk53,id=virtio-disk53 \
--drive file=/var/lib/libvirt/images/disk-b-c.img,format=raw,if=none,id=drive-virtio-disk54 \
--device virtio-blk-pci,bus=pci.0,addr=0xc,drive=drive-virtio-disk54,id=virtio-disk54 \
--drive file=/var/lib/libvirt/images/disk-b-d.img,format=raw,if=none,id=drive-virtio-disk55 \
--device virtio-blk-pci,bus=pci.0,addr=0xd,drive=drive-virtio-disk55,id=virtio-disk55 \
--drive file=/var/lib/libvirt/images/disk-c-a.img,format=raw,if=none,id=drive-virtio-disk78 \
--device virtio-blk-pci,bus=pci.0,addr=0xe,drive=drive-virtio-disk78,id=virtio-disk78 \
--drive file=/var/lib/libvirt/images/disk-c-b.img,format=raw,if=none,id=drive-virtio-disk79 \
--device virtio-blk-pci,bus=pci.0,addr=0xf,drive=drive-virtio-disk79,id=virtio-disk79 \
--drive file=/var/lib/libvirt/images/disk-c-c.img,format=raw,if=none,id=drive-virtio-disk80 \
--device virtio-blk-pci,bus=pci.0,addr=0x10,drive=drive-virtio-disk80,id=virtio-disk80 \
--drive file=/var/lib/libvirt/images/disk-c-d.img,format=raw,if=none,id=drive-virtio-disk81 \
--device virtio-blk-pci,bus=pci.0,addr=0x11,drive=drive-virtio-disk81,id=virtio-disk81 \
--drive file=/var/lib/libvirt/images/disk-d-a.img,format=raw,if=none,id=drive-virtio-disk104 \
--device virtio-blk-pci,bus=pci.0,addr=0x12,drive=drive-virtio-disk104,id=virtio-disk104 \
--drive file=/var/lib/libvirt/images/disk-d-b.img,format=raw,if=none,id=drive-virtio-disk105 \
--device virtio-blk-pci,bus=pci.0,addr=0x13,drive=drive-virtio-disk105,id=virtio-disk105 \
--drive file=/var/lib/libvirt/images/disk-d-c.img,format=raw,if=none,id=drive-virtio-disk106 \
--device virtio-blk-pci,bus=pci.0,addr=0x14,drive=drive-virtio-disk106,id=virtio-disk106 \
--drive file=/var/lib/libvirt/images/disk-d-d.img,format=raw,if=none,id=drive-virtio-disk107 \
--device virtio-blk-pci,bus=pci.0,addr=0x15,drive=drive-virtio-disk107,id=virtio-disk107 \
--drive file=/var/lib/libvirt/images/disk-e-a.img,format=raw,if=none,id=drive-virtio-disk130 \
--device virtio-blk-pci,bus=pci.0,addr=0x16,drive=drive-virtio-disk130,id=virtio-disk130 \
--drive file=/var/lib/libvirt/images/disk-e-b.img,format=raw,if=none,id=drive-virtio-disk131 \
--device virtio-blk-pci,bus=pci.0,addr=0x17,drive=drive-virtio-disk131,id=virtio-disk131 \
--drive file=/var/lib/libvirt/images/disk-e-c.img,format=raw,if=none,id=drive-virtio-disk132 \
--device virtio-blk-pci,bus=pci.0,addr=0x18,drive=drive-virtio-disk132,id=virtio-disk132 \
--drive file=/var/lib/libvirt/images/disk-e-d.img,format=raw,if=none,id=drive-virtio-disk133 \
--device virtio-blk-pci,bus=pci.0,addr=0x19,drive=drive-virtio-disk133,id=virtio-disk133 \
--drive file=/var/lib/libvirt/images/disk-f-a.img,format=raw,if=none,id=drive-virtio-disk156 \
--device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=drive-virtio-disk156,id=virtio-disk156 \
--drive file=/var/lib/libvirt/images/disk-f-b.img,format=raw,if=none,id=drive-virtio-disk157 \
--device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=drive-virtio-disk157,id=virtio-disk157 \
--drive file=/var/lib/libvirt/images/disk-f-c.img,format=raw,if=none,id=drive-virtio-disk158 \
--device virtio-blk-pci,bus=pci.0,addr=0x1c,drive=drive-virtio-disk158,id=virtio-disk158 \
--drive file=/var/lib/libvirt/images/disk-f-d.img,format=raw,if=none,id=drive-virtio-disk159 \
--device virtio-blk-pci,bus=pci.0,addr=0x1d,drive=drive-virtio-disk159,id=virtio-disk159 \
--drive file=/var/lib/libvirt/images/disk-g-a.img,format=raw,if=none,id=drive-virtio-disk182 \
--device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182 \
--drive file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
--device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183 \
+-blockdev '{"driver":"file","filename":"/var/iso/f18kde.iso","node-name":"libvirt-29-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-29-format","read-only":true,"driver":"raw","file":"libvirt-29-storage"}' \
+-device ide-cd,bus=ide.1,unit=0,drive=libvirt-29-format,id=ide0-1-0 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test.img","node-name":"libvirt-28-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-28-format","read-only":false,"driver":"raw","file":"libvirt-28-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=libvirt-28-format,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/test1.img","node-name":"libvirt-27-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-27-format","read-only":false,"driver":"raw","file":"libvirt-27-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=libvirt-27-format,id=virtio-disk1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-a.img","node-name":"libvirt-26-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-26-format","read-only":false,"driver":"raw","file":"libvirt-26-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-26-format,id=virtio-disk26 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-b.img","node-name":"libvirt-25-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-25-format","read-only":false,"driver":"raw","file":"libvirt-25-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x7,drive=libvirt-25-format,id=virtio-disk27 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-c.img","node-name":"libvirt-24-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-24-format","read-only":false,"driver":"raw","file":"libvirt-24-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=libvirt-24-format,id=virtio-disk28 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-a-d.img","node-name":"libvirt-23-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-23-format","read-only":false,"driver":"raw","file":"libvirt-23-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x9,drive=libvirt-23-format,id=virtio-disk29 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-a.img","node-name":"libvirt-22-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-22-format","read-only":false,"driver":"raw","file":"libvirt-22-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xa,drive=libvirt-22-format,id=virtio-disk52 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-b.img","node-name":"libvirt-21-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-21-format","read-only":false,"driver":"raw","file":"libvirt-21-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xb,drive=libvirt-21-format,id=virtio-disk53 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-c.img","node-name":"libvirt-20-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-20-format","read-only":false,"driver":"raw","file":"libvirt-20-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xc,drive=libvirt-20-format,id=virtio-disk54 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-b-d.img","node-name":"libvirt-19-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-19-format","read-only":false,"driver":"raw","file":"libvirt-19-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xd,drive=libvirt-19-format,id=virtio-disk55 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-a.img","node-name":"libvirt-18-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-18-format","read-only":false,"driver":"raw","file":"libvirt-18-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xe,drive=libvirt-18-format,id=virtio-disk78 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-b.img","node-name":"libvirt-17-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-17-format","read-only":false,"driver":"raw","file":"libvirt-17-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0xf,drive=libvirt-17-format,id=virtio-disk79 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-c.img","node-name":"libvirt-16-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-16-format","read-only":false,"driver":"raw","file":"libvirt-16-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x10,drive=libvirt-16-format,id=virtio-disk80 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-c-d.img","node-name":"libvirt-15-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-15-format","read-only":false,"driver":"raw","file":"libvirt-15-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x11,drive=libvirt-15-format,id=virtio-disk81 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-a.img","node-name":"libvirt-14-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-14-format","read-only":false,"driver":"raw","file":"libvirt-14-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x12,drive=libvirt-14-format,id=virtio-disk104 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-b.img","node-name":"libvirt-13-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-13-format","read-only":false,"driver":"raw","file":"libvirt-13-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x13,drive=libvirt-13-format,id=virtio-disk105 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-c.img","node-name":"libvirt-12-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-12-format","read-only":false,"driver":"raw","file":"libvirt-12-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x14,drive=libvirt-12-format,id=virtio-disk106 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-d-d.img","node-name":"libvirt-11-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-11-format","read-only":false,"driver":"raw","file":"libvirt-11-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x15,drive=libvirt-11-format,id=virtio-disk107 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-a.img","node-name":"libvirt-10-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-10-format","read-only":false,"driver":"raw","file":"libvirt-10-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x16,drive=libvirt-10-format,id=virtio-disk130 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-b.img","node-name":"libvirt-9-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-9-format","read-only":false,"driver":"raw","file":"libvirt-9-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x17,drive=libvirt-9-format,id=virtio-disk131 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-c.img","node-name":"libvirt-8-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-8-format","read-only":false,"driver":"raw","file":"libvirt-8-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x18,drive=libvirt-8-format,id=virtio-disk132 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-e-d.img","node-name":"libvirt-7-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-7-format","read-only":false,"driver":"raw","file":"libvirt-7-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x19,drive=libvirt-7-format,id=virtio-disk133 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-a.img","node-name":"libvirt-6-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-6-format","read-only":false,"driver":"raw","file":"libvirt-6-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1a,drive=libvirt-6-format,id=virtio-disk156 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-b.img","node-name":"libvirt-5-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-5-format","read-only":false,"driver":"raw","file":"libvirt-5-storage"}' \
+-device virtio-blk-pci,bus=pci.0,addr=0x1b,drive=libvirt-5-format,id=virtio-disk157 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-c.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,bus=pci.0,addr=0x1c,drive=libvirt-4-format,id=virtio-disk158 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-f-d.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,bus=pci.0,addr=0x1d,drive=libvirt-3-format,id=virtio-disk159 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-a.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,bus=pci.0,addr=0x1e,drive=libvirt-2-format,id=virtio-disk182 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/disk-g-b.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,bus=pci.0,addr=0x1f,drive=libvirt-1-format,id=virtio-disk183 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index b1cdec3d1d..1c02ef4493 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,rombar=1 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index ecc02d35df..651b2732f5 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
index c4f59dd934..7db64d7969 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -62,8 +62,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \
 -device xio3130-downstream,port=29,chassis=33,id=pci.33,bus=pci.3,addr=0x1d \
 -device xio3130-downstream,port=30,chassis=34,id=pci.34,bus=pci.3,addr=0x1e \
 -device xio3130-downstream,port=31,chassis=35,id=pci.35,bus=pci.3,addr=0x1f \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:f1:95:51,bus=pci.4,addr=0x0 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
index 64469264b0..7ae8645b17 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -boot strict=on \
 -device ioh3420,port=16,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
 -device ioh3420,port=26,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 228af19fa4..63769ed0cf 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -35,8 +35,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device xio3130-downstream,port=4,chassis=8,id=pci.8,bus=pci.2,addr=0x4 \
 -device xio3130-downstream,port=5,chassis=9,id=pci.9,bus=pci.2,addr=0x5 \
 -device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 71970f91d1..a260479b44 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -29,8 +29,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device ioh3420,port=17,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
 -device x3130-upstream,id=pci.3,bus=pci.1,addr=0x0 \
 -device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
index 77685e127e..e5114936ea 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -no-acpi \
 -boot strict=on \
 -global q35-pcihost.pci-hole64-size=1048576K \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index 34e9b83556..5989b38a25 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device spapr-vscsi,id=scsi0,reg=8192 \
 -device spapr-vscsi,id=scsi1,reg=805306368 \
 -usb \
--drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \
--device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=536870912 \
 -chardev pty,id=charserial1 \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
index a5a641b49b..53277f2287 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -27,8 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -device spapr-vscsi,id=scsi0,reg=8192 \
 -device spapr-vscsi,id=scsi1,reg=12288 \
 -usb \
--drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi1-0-0-0 \
--device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=drive-scsi1-0-0-0,id=scsi1-0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
 -chardev pty,id=charserial1 \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index 019943f6dd..3db83f2a10 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -42,8 +42,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device nec-usb-xhci,id=usb,bus=pci.6,addr=0x0 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.5,addr=0x0 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.4,addr=0x0 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.7,addr=0x0,drive=drive-virtio-disk1,id=virtio-disk1,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.7,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
 -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.1,addr=0x0 \
 -netdev user,id=hostnet0 \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index 2f922f9352..48e6ae0557 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -43,8 +43,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device nec-usb-xhci,id=usb,bus=pci.8,addr=0x0 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.7,addr=0x0 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.6,addr=0x0 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.9,addr=0x0,drive=drive-virtio-disk1,id=virtio-disk1,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.9,addr=0x0,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
 -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.3,addr=0x0 \
 -netdev user,id=hostnet0 \
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 0722fd972e..e2a2cbdd19 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -39,8 +39,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \
 -device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \
 -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 43cb4657bc..3c7f1e6199 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -39,8 +39,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
 -device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.2,addr=0x1.0x1 \
 -device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 745a7bdbc4..325bbd31c7 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 4c8e2781c7..fe00c9e0eb 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -34,8 +34,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
 -device ioh3420,port=21,chassis=6,id=pci.6,bus=pcie.0,addr=0x2.0x5 \
 -device nec-usb-xhci,id=usb,bus=pci.2,addr=0x0 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.3,addr=0x0 \
--drive file=/var/lib/libvirt/images/basic.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pci.4,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/basic.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,bus=pci.4,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:9a:e6:c6,bus=pci.1,addr=0x0 \
 -chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 6fc72ca1df..fe42f07e82 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -43,8 +43,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device nec-usb-xhci,id=usb,bus=pci.4,addr=0x0 \
 -device virtio-scsi-pci,id=scsi0,bus=pci.2,addr=0x4 \
 -device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x3 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk1 \
--device virtio-blk-pci,bus=pci.2,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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,bus=pci.2,addr=0x5,drive=libvirt-1-format,id=virtio-disk1,bootindex=1 \
 -fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
 -device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.2,addr=0x1 \
 -netdev user,id=hostnet0 \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 5054c6ca17..cd76c36cfa 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -29,8 +29,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 -device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \
 -device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
 -device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
--device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,drive=libvirt-1-format,id=sata0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
index c96042232b..e815384c1f 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -28,8 +28,9 @@ BAR='' \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -unknown parameter \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 4711cfcd93..e9f081d8a1 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 4711cfcd93..e9f081d8a1 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 4711cfcd93..e9f081d8a1 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 4711cfcd93..e9f081d8a1 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 4711cfcd93..e9f081d8a1 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 4711cfcd93..e9f081d8a1 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 879f0b3e40..73077c6bed 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -unknown parameter \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
index 96a756603d..99dc12827b 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -incoming fd:7 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
index c930c83f0c..34c8ca8bfa 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -incoming exec:cat \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index 5833041823..d981bfe2c7 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
 -boot strict=on \
 -kernel /var/lib/libvirt/images/riscv64.bbl \
 -append root=/dev/vda \
--drive file=/var/lib/libvirt/images/riscv64.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
--device virtio-blk-pci,bus=pcie.0,addr=0x1,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/riscv64.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,bus=pcie.0,addr=0x1,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args
index ba21b2f307..05f8752120 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
 -boot strict=on \
 -kernel /var/lib/libvirt/images/bbl \
 -append 'console=ttyS0 ro root=/dev/vda' \
--drive file=/var/lib/libvirt/images/stage4-disk.img,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/stage4-disk.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-device,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -serial chardev:charserial0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index c722de5d51..abc349c7f8 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -26,10 +26,12 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
--drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-1 \
--device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-2-format,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest2","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 ide-hd,bus=ide.0,unit=1,drive=libvirt-1-format,id=ide0-0-1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
index dbcb959334..24193d008b 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 13911e128c..735dcd053a 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 9f023da2d4..52f9c3d0bb 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev tty,id=charserial0,path=/dev/ttyS2 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
index 3c4b30c577..3d6c0c06af 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -add-fd set=0,fd=1750,opaque=serial0-source \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
index c06750eac6..6be67736e5 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -add-fd set=0,fd=1750,opaque=serial0-source \
 -add-fd set=1,fd=1751,opaque=serial0-log \
 -chardev file,id=charserial0,path=/dev/fdset/0,append=on,logfile=/dev/fdset/1,logappend=on \
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
index 5a82badf63..0a341b32df 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -add-fd set=0,fd=1750,opaque=serial1-source \
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
index cf08357b27..a495cc9c92 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
index f736af38d5..8b1b3460d3 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -device usb-tablet,id=input0,bus=usb.0,port=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 6450ecdf8d..d45da68a0f 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 7ba22be033..57fd5567e1 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,wait=off \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index 9a8988b79e..e6450c1fbc 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev socket,id=charserial1,host=127.0.0.1,port=5555 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 9cdf2ca6f5..3e487aabbc 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 9cdf2ca6f5..3e487aabbc 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -object tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 3cf523bb80..9bb1198232 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev udp,id=charserial0,host=127.0.0.1,port=2222,localaddr=127.0.0.1,localport=1111 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -object secret,id=charserial1-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 4cbd3b4f4c..e2e55363d5 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev udp,id=charserial0,host=127.0.0.1,port=9998,localaddr=127.0.0.1,localport=9999 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 7731c71fcc..e3eff53d26 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -chardev vc,id=charserial0 \
 -device isa-serial,chardev=charserial0,id=serial0,index=0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 986f72f6c7..e8897de22d 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 31f56159ca..c4ac933b81 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -31,8 +31,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 4b0188b706..a2852faa74 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index d2d4368d29..a4d5aea536 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -26,7 +26,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
index 6d8c2b5372..a017aa8567 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -soundhw pcspk \
 -device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index c2f923e51a..80385bfa31 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -soundhw pcspk \
 -device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.args
index 5877b88013..a265a3ad38 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -25,9 +25,11 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-redhat62sparc/.config \
 -no-shutdown \
 -boot strict=on \
 -usb \
--drive file=/home/berrange/VirtualMachines/redhat-6.2-sparc.img,format=qcow2,if=none,id=drive-scsi0-0-0-0 \
--device scsi-hd,bus=scsi.0,scsi-id=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
--drive file=/home/berrange/VirtualMachines/redhat-6.2-sparc.iso,format=raw,if=none,id=drive-scsi0-0-0-1,readonly=on \
--device scsi-cd,bus=scsi.0,scsi-id=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
+-blockdev '{"driver":"file","filename":"/home/berrange/VirtualMachines/redhat-6.2-sparc.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
+-device scsi-hd,bus=scsi.0,scsi-id=0,drive=libvirt-2-format,id=scsi0-0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/home/berrange/VirtualMachines/redhat-6.2-sparc.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
+-device scsi-cd,bus=scsi.0,scsi-id=1,drive=libvirt-1-format,id=scsi0-0-0-1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 50f5067a9d..e216aacc64 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=audio1 \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
index 533bb92786..e47545e72a 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=audio1 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index 7c5d1ef124..1332f798da 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
index 666f47a59c..dc679b7aa5 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
index 10d431a633..653c46d005 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 453c572a4b..8670066b20 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
index c48eef1b4a..f4c896e023 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=8,xres=1280,yres=720,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 560bbfd9b0..42de87528c 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 9d9d883e60..c55e3eb9db 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 73fe9a0672..8d1108216e 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
index 296ac69132..1a832df4cb 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device VGA,id=video0,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 10d431a633..653c46d005 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
 -device qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index 42354c6eca..8267f837bc 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -23,8 +23,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -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,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=audio1 \
 -device virtio-gpu-ccw,id=video0,max_outputs=1,devno=fe.0.0002 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 72d3c3bde3..1dd818f5fc 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index 27343bc101..d4ab9fac16 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -display sdl,gl=on \
 -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index c16450e3fd..f198d4da8b 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"spice"}' \
 -spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \
 -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index ab7686b3f8..140bee6187 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
index 75be9dc8ed..704a6334b0 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -usb \
--drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
--device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
+-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \
+-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-vga,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 11650f12b3..a8de4a3789 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -25,8 +25,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-shutdown \
 -boot strict=on \
 -device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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-ccw,devno=fe.0.0000,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \
 -chardev pty,id=charconsole0 \
 -device virtconsole,chardev=charconsole0,id=console0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index b1912a19d9..e3a99cc8e7 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -26,8 +26,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=on \
 -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 \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","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 ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -device vmcoreinfo \
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 6dabbaf36a..d44dc09219 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -856,6 +856,10 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
     if (!(info->args.fakeCaps = virQEMUCapsNew()))
         abort();

+    /* until removal of the flags is completed we force them also in tests */
+    virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV);
+    virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);
+
     info->conf = conf;
     info->args.newargs = true;

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:53 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:53 +0200
Subject: [PATCH 15/80] qemu: Refactor access to 'qomName' field of the qemu
 disk private data
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <ebdb2cea3a72db3940f2f67c8b45abd3a5ca4607.1658843187.git.pkrempa@redhat.com>

The code which fills 'qomName' does so only when the blockdev capability
is enabled so we don't have to check it separately as it can be only
non-NULL when blockdev is used.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c  | 29 ++++++++++++-----------------
 src/qemu/qemu_process.c |  3 +--
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index cfb02f7b0f..d5a3181c0d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10119,16 +10119,15 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver,
             return -1;
         }

-        if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
+        if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName)
             entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
-        } else {
-            if (!disk->info.alias) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("missing disk device alias name for %s"), disk->dst);
-                return -1;
-            }
-
+        else
             entryname = disk->info.alias;
+
+        if (!entryname) {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                           _("missing disk device alias name for %s"), disk->dst);
+            return -1;
         }
     }

@@ -10180,7 +10179,7 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver,
             if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER)
                 continue;

-            if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName)
+            if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName)
                 entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;

             if (!entryname)
@@ -16312,8 +16311,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
         if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
             goto endjob;

-        if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-            QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
+        if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
             qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
         } else {
             if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
@@ -16497,8 +16495,7 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
         if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
             goto endjob;

-        if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-            QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
+        if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
             qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
         } else {
             if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
@@ -16597,7 +16594,6 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
     virDomainObj *vm = NULL;
     qemuDomainObjPrivate *priv;
     g_autoptr(GHashTable) table = NULL;
-    bool blockdev = false;
     int ret = -1;
     size_t i;
     int n = 0;
@@ -16608,7 +16604,6 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
         goto cleanup;

     priv = vm->privateData;
-    blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);

     if (virDomainGetDiskErrorsEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
@@ -16636,7 +16631,7 @@ qemuDomainGetDiskErrors(virDomainPtr dom,
         qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
         const char *entryname = disk->info.alias;

-        if (blockdev && diskPriv->qomName)
+        if (diskPriv->qomName)
             entryname = diskPriv->qomName;

         if ((info = virHashLookup(table, entryname)) &&
@@ -18505,7 +18500,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,

         /* for 'sd' disks we won't be displaying stats for the backing chain
          * as we don't update the stats correctly */
-        if (blockdev && QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
+        if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
             frontendalias = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
             backendalias = n->nodeformat;
             backendstoragealias = n->nodestorage;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 438c903578..260116dc67 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8593,7 +8593,6 @@ qemuProcessRefreshDisks(virQEMUDriver *driver,
                         virDomainAsyncJob asyncJob)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     g_autoptr(GHashTable) table = NULL;
     size_t i;

@@ -8611,7 +8610,7 @@ qemuProcessRefreshDisks(virQEMUDriver *driver,
         struct qemuDomainDiskInfo *info;
         const char *entryname = disk->info.alias;

-        if (blockdev && diskpriv->qomName)
+        if (diskpriv->qomName)
             entryname = diskpriv->qomName;

         if (!(info = virHashLookup(table, entryname)))
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:54 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:54 +0200
Subject: [PATCH 16/80] qemu: command: Always assume support for
 QEMU_CAPS_SCSI_DISK_DEVICE_ID
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <123def92ef567db6c603675059c6974d43c934c0.1658843187.git.pkrempa@redhat.com>

The 'device_id' property of 'scsi_disk' was added in qemu-4.0 and it's
unconditionally present, thus we can now always assume it's presence.

Update some fake-caps test which didn't yet assert the capability.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c                              | 12 +++++-------
 .../aarch64-virtio-pci-manual-addresses.args         |  2 +-
 tests/qemuxml2argvdata/multifunction-pci-device.args |  2 +-
 .../qemuxml2argvdata/pseries-vio-user-assigned.args  |  2 +-
 tests/qemuxml2argvdata/pseries-vio.args              |  2 +-
 tests/qemuxml2argvdata/sparc-minimal.args            |  4 ++--
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 17aac57b03..cb54190780 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2141,13 +2141,11 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
              * disk serial was not set and the disk serial otherwise.
              * To avoid a guest-visible regression we need to provide it
              * ourselves especially for cases when -blockdev will be used */
-            if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SCSI_DISK_DEVICE_ID)) {
-                if (disk->serial) {
-                    scsiVPDDeviceId = g_strdup(disk->serial);
-                } else {
-                    if (!(scsiVPDDeviceId = qemuAliasDiskDriveFromDisk(disk)))
-                        return NULL;
-                }
+            if (disk->serial) {
+                scsiVPDDeviceId = g_strdup(disk->serial);
+            } else {
+                if (!(scsiVPDDeviceId = qemuAliasDiskDriveFromDisk(disk)))
+                    return NULL;
             }
         }

diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 3000fea1a6..5242f680d2 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -36,7 +36,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -device virtio-scsi-pci,id=scsi0,bus=pci.3,addr=0x1 \
 -blockdev '{"driver":"file","filename":"/aarch64.raw","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 scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi0-0-0-0,bootindex=1 \
+-device scsi-hd,bus=scsi0.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi0-0-0-0,drive=libvirt-1-format,id=scsi0-0-0-0,bootindex=1 \
 -netdev user,id=hostnet0 \
 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,addr=0x2 \
 -netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index accb08bd33..2569c3ec71 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -37,7 +37,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -usb \
 -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device scsi-hd,bus=scsi0.0,scsi-id=0,drive=libvirt-1-format,id=scsi0-0-0,bootindex=1 \
+-device scsi-hd,bus=scsi0.0,scsi-id=0,device_id=drive-scsi0-0-0,drive=libvirt-1-format,id=scsi0-0-0,bootindex=1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index 5989b38a25..88ff276a4b 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -usb \
 -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
+-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi1-0-0-0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=536870912 \
 -chardev pty,id=charserial1 \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
index 53277f2287..f83d891682 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -usb \
 -blockdev '{"driver":"file","filename":"/tmp/scsidisk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
--device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
+-device scsi-hd,bus=scsi1.0,channel=0,scsi-id=0,lun=0,device_id=drive-scsi1-0-0-0,drive=libvirt-1-format,id=scsi1-0-0-0,bootindex=1 \
 -chardev pty,id=charserial0 \
 -device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
 -chardev pty,id=charserial1 \
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.args
index a265a3ad38..63930f20c4 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -27,9 +27,9 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-redhat62sparc/.config \
 -usb \
 -blockdev '{"driver":"file","filename":"/home/berrange/VirtualMachines/redhat-6.2-sparc.img","node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"qcow2","file":"libvirt-2-storage"}' \
--device scsi-hd,bus=scsi.0,scsi-id=0,drive=libvirt-2-format,id=scsi0-0-0-0,bootindex=1 \
+-device scsi-hd,bus=scsi.0,scsi-id=0,device_id=drive-scsi0-0-0-0,drive=libvirt-2-format,id=scsi0-0-0-0,bootindex=1 \
 -blockdev '{"driver":"file","filename":"/home/berrange/VirtualMachines/redhat-6.2-sparc.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \
--device scsi-cd,bus=scsi.0,scsi-id=1,drive=libvirt-1-format,id=scsi0-0-0-1 \
+-device scsi-cd,bus=scsi.0,scsi-id=1,device_id=drive-scsi0-0-0-1,drive=libvirt-1-format,id=scsi0-0-0-1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -msg timestamp=on
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:55 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:55 +0200
Subject: [PATCH 17/80] qemu: capabilities: Retire capabilities used for
 -blockdev detection
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <719e5ed5144ae1d50f85995d5e00464b65d7f6eb.1658843187.git.pkrempa@redhat.com>

Retire:
    QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC
    QEMU_CAPS_SCSI_DISK_DEVICE_ID
    QEMU_CAPS_SAVEVM_MONITOR_NODES

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 9 +++------
 src/qemu/qemu_capabilities.h                      | 6 +++---
 tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml   | 2 --
 tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 3 ---
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 3 ---
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 3 ---
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 3 ---
 28 files changed, 6 insertions(+), 86 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9cffb07b9d..d660b3b9f0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -521,7 +521,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "nvdimm.unarmed", /* QEMU_CAPS_DEVICE_NVDIMM_UNARMED */

               /* 325 */
-              "scsi-disk.device_id", /* QEMU_CAPS_SCSI_DISK_DEVICE_ID */
+              "scsi-disk.device_id", /* X_QEMU_CAPS_SCSI_DISK_DEVICE_ID */
               "virtio-pci-non-transitional", /* QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL */
               "overcommit", /* X_QEMU_CAPS_OVERCOMMIT */
               "query-current-machine", /* QEMU_CAPS_QUERY_CURRENT_MACHINE */
@@ -550,8 +550,8 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 345 */
               "arm-max-cpu", /* QEMU_CAPS_ARM_MAX_CPU */
-              "blockdev-file-dynamic-auto-read-only", /* QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC */
-              "savevm-monitor-nodes", /* QEMU_CAPS_SAVEVM_MONITOR_NODES */
+              "blockdev-file-dynamic-auto-read-only", /* X_QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC */
+              "savevm-monitor-nodes", /* X_QEMU_CAPS_SAVEVM_MONITOR_NODES */
               "drive-nvme", /* QEMU_CAPS_DRIVE_NVME */
               "smp-dies", /* QEMU_CAPS_SMP_DIES */

@@ -1483,7 +1483,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
     { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL },
     { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL },
     { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL },
-    { "device_id", QEMU_CAPS_SCSI_DISK_DEVICE_ID, NULL },
     { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL },
 };

@@ -1586,7 +1585,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioIOMMU[] =
 static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
     { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
-    { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
     { "blockdev-add/arg-type/+file/aio/^io_uring", QEMU_CAPS_AIO_IO_URING },
     { "blockdev-add/arg-type/+rbd/encrypt", QEMU_CAPS_RBD_ENCRYPTION },
@@ -1597,7 +1595,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "chardev-add/arg-type/backend/+file/data/logfile", QEMU_CAPS_CHARDEV_LOGFILE },
     { "chardev-add/arg-type/backend/+file/data/logappend", QEMU_CAPS_CHARDEV_FILE_APPEND },
     { "device_add/$json-cli-hotplug", QEMU_CAPS_DEVICE_JSON },
-    { "human-monitor-command/$savevm-monitor-nodes", QEMU_CAPS_SAVEVM_MONITOR_NODES },
     { "migrate-set-parameters/arg-type/block-bitmap-mapping/bitmaps/transform", QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING },
     { "nbd-server-start/arg-type/tls-creds", QEMU_CAPS_NBD_TLS },
     { "nbd-server-add/arg-type/bitmap", QEMU_CAPS_NBD_BITMAP },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 7c5df0554b..5ca177b599 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -500,7 +500,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_NVDIMM_UNARMED, /* -device nvdimm,unarmed= */

     /* 325 */
-    QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
+    X_QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */
     QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, /* virtio *-pci-{non-}transitional devices */
     X_QEMU_CAPS_OVERCOMMIT, /* -overcommit */
     QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */
@@ -529,8 +529,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 345 */
     QEMU_CAPS_ARM_MAX_CPU, /* max-arm-cpu type exists */
-    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 */
+    X_QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC, /* the auto-read-only property of block backends for files is dynamic */
+    X_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= */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index c801c11391..e1f69fbcde 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -119,7 +119,6 @@
   <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='query-current-machine'/>
   <flag name='machine.virt.iommu'/>
@@ -130,8 +129,6 @@
   <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='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 702f6551a4..c78ae4ee45 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -120,7 +120,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -130,7 +129,6 @@
   <flag name='vhost-user-gpu'/>
   <flag name='vhost-user-vga'/>
   <flag name='machine.pseries.cap-ccf-assist'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 290a663904..8c88873fc5 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -89,7 +89,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -98,8 +97,6 @@
   <flag name='vhost-user-gpu'/>
   <flag name='query-cpu-model-baseline'/>
   <flag name='query-cpu-model-comparison'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index a2e36da5bf..5fb954a7d2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -156,7 +156,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index ba0be2518e..c4e2fb70aa 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -122,7 +122,6 @@
   <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='query-current-machine'/>
   <flag name='machine.virt.iommu'/>
@@ -134,8 +133,6 @@
   <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='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 15c4beea98..2c10b10122 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -124,7 +124,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -135,8 +134,6 @@
   <flag name='vhost-user-gpu'/>
   <flag name='vhost-user-vga'/>
   <flag name='machine.pseries.cap-ccf-assist'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 9d24daa1a9..c170036059 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -118,7 +118,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -127,8 +126,6 @@
   <flag name='migration-file-drop-cache'/>
   <flag name='dbus-vmstate'/>
   <flag name='vhost-user-gpu'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 18970c1f90..bf43ded774 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -156,7 +156,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -170,8 +169,6 @@
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 6052009362..ce86189e15 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -50,14 +50,11 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
   <flag name='nbd-bitmap'/>
   <flag name='migration-file-drop-cache'/>
   <flag name='dbus-vmstate'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 630d69d8ff..ea5df78e4b 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -155,7 +155,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 182694aca5..174bd93bf2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -122,7 +122,6 @@
   <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='query-current-machine'/>
   <flag name='machine.virt.iommu'/>
@@ -134,8 +133,6 @@
   <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='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 14f648efd6..61ae1574e4 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -122,7 +122,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -133,8 +132,6 @@
   <flag name='vhost-user-gpu'/>
   <flag name='vhost-user-vga'/>
   <flag name='machine.pseries.cap-ccf-assist'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 09998c9564..612c73b851 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -116,7 +116,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -125,8 +124,6 @@
   <flag name='migration-file-drop-cache'/>
   <flag name='dbus-vmstate'/>
   <flag name='vhost-user-gpu'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 9c24f45f69..2cb60c98c8 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -87,7 +87,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -97,8 +96,6 @@
   <flag name='vhost-user-gpu'/>
   <flag name='query-cpu-model-baseline'/>
   <flag name='query-cpu-model-comparison'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 25cbeaacf0..087b721a61 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -155,7 +155,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 4e386dd29a..ca3dca4369 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -122,7 +122,6 @@
   <flag name='egl-headless.rendernode'/>
   <flag name='memory-backend-file.align'/>
   <flag name='nvdimm.unarmed'/>
-  <flag name='scsi-disk.device_id'/>
   <flag name='virtio-pci-non-transitional'/>
   <flag name='query-current-machine'/>
   <flag name='machine.virt.iommu'/>
@@ -134,8 +133,6 @@
   <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='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 66763ef480..65cb666714 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -86,7 +86,6 @@
   <flag name='iothread.poll-max-ns'/>
   <flag name='egl-headless.rendernode'/>
   <flag name='memory-backend-file.align'/>
-  <flag name='scsi-disk.device_id'/>
   <flag name='virtio-pci-non-transitional'/>
   <flag name='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -96,8 +95,6 @@
   <flag name='vhost-user-gpu'/>
   <flag name='query-cpu-model-baseline'/>
   <flag name='query-cpu-model-comparison'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index b4f31cdebd..aabcac1f5d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -155,7 +155,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -169,8 +168,6 @@
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 67e68ce7c8..5d398181c2 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -153,7 +153,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
   <flag name='vhost-user-vga'/>
   <flag name='incremental-backup'/>
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 20ba835984..ec1a2d9cca 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -129,7 +129,6 @@
   <flag name='egl-headless.rendernode'/>
   <flag name='memory-backend-file.align'/>
   <flag name='nvdimm.unarmed'/>
-  <flag name='scsi-disk.device_id'/>
   <flag name='virtio-pci-non-transitional'/>
   <flag name='query-current-machine'/>
   <flag name='machine.virt.iommu'/>
@@ -142,8 +141,6 @@
   <flag name='incremental-backup'/>
   <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='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 2d1ca291a9..52b0af3d6e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -119,7 +119,6 @@
   <flag name='machine.pseries.cap-nested-hv'/>
   <flag name='memory-backend-file.align'/>
   <flag name='nvdimm.unarmed'/>
-  <flag name='scsi-disk.device_id'/>
   <flag name='virtio-pci-non-transitional'/>
   <flag name='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -131,8 +130,6 @@
   <flag name='vhost-user-vga'/>
   <flag name='incremental-backup'/>
   <flag name='machine.pseries.cap-ccf-assist'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 7dc962f9c4..243fb41ca8 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -153,7 +153,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
   <flag name='vhost-user-vga'/>
   <flag name='incremental-backup'/>
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 7627b5b03c..5700c5e06b 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -129,7 +129,6 @@
   <flag name='egl-headless.rendernode'/>
   <flag name='memory-backend-file.align'/>
   <flag name='nvdimm.unarmed'/>
-  <flag name='scsi-disk.device_id'/>
   <flag name='virtio-pci-non-transitional'/>
   <flag name='query-current-machine'/>
   <flag name='machine.virt.iommu'/>
@@ -142,8 +141,6 @@
   <flag name='incremental-backup'/>
   <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='rng-builtin'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 5710c609f9..b2d48cc081 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -128,7 +128,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -140,8 +139,6 @@
   <flag name='vhost-user-vga'/>
   <flag name='incremental-backup'/>
   <flag name='machine.pseries.cap-ccf-assist'/>
-  <flag name='blockdev-file-dynamic-auto-read-only'/>
-  <flag name='savevm-monitor-nodes'/>
   <flag name='drive-nvme'/>
   <flag name='smp-dies'/>
   <flag name='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 8c5aea8aa5..528be3c459 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -153,7 +153,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
   <flag name='vhost-user-vga'/>
   <flag name='incremental-backup'/>
   <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='i8042'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 84c598a286..a9cc271892 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -153,7 +153,6 @@
   <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='query-current-machine'/>
   <flag name='bitmap-merge'/>
@@ -168,8 +167,6 @@
   <flag name='vhost-user-vga'/>
   <flag name='incremental-backup'/>
   <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='i8042'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:58 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:58 +0200
Subject: [PATCH 20/80] qemu: block: Remove legacy spellings for
 InetSocketAddress
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f8193ab3e34c0839ae2d31e0afcc96a2c66d3e83.1658843187.git.pkrempa@redhat.com>

In one of early iterations of the gluster driver 'tcp' was used instead
of 'inet' and 'socket' instead of 'path' for unix sockets. All of this
can be now removed.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c | 44 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 9fe22f18f2..870d44ecd5 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -432,36 +432,24 @@ qemuBlockStorageSourceGetURI(virStorageSource *src)
 /**
  * qemuBlockStorageSourceBuildJSONSocketAddress
  * @host: the virStorageNetHostDef * definition to build
- * @legacy: use old field names/values
  *
  * Formats @hosts into a json object conforming to the 'SocketAddress' type
  * in qemu.
  *
- * For compatibility with old approach used in the gluster driver of old qemus
- * use the old spelling for TCP transport and, the path field of the unix socket.
- *
  * Returns a virJSONValue * for a single server.
  */
 static virJSONValue *
-qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host,
-                                             bool legacy)
+qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host)
 {
     g_autoptr(virJSONValue) server = NULL;
-    const char *transport;
-    const char *field;
     g_autofree char *port = NULL;

     switch ((virStorageNetHostTransport) host->transport) {
     case VIR_STORAGE_NET_HOST_TRANS_TCP:
-        if (legacy)
-            transport = "tcp";
-        else
-            transport = "inet";
-
         port = g_strdup_printf("%u", host->port);

         if (virJSONValueObjectAdd(&server,
-                                  "s:type", transport,
+                                  "s:type", "inet",
                                   "s:host", host->name,
                                   "s:port", port,
                                   NULL) < 0)
@@ -469,14 +457,9 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host,
         break;

     case VIR_STORAGE_NET_HOST_TRANS_UNIX:
-        if (legacy)
-            field = "s:socket";
-        else
-            field = "s:path";
-
         if (virJSONValueObjectAdd(&server,
                                   "s:type", "unix",
-                                  field, host->socket,
+                                  "s:path", host->socket,
                                   NULL) < 0)
             return NULL;
         break;
@@ -496,14 +479,12 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDef *host,
 /**
  * qemuBlockStorageSourceBuildHostsJSONSocketAddress:
  * @src: disk storage source
- * @legacy: use 'tcp' instead of 'inet' for compatibility reasons
  *
  * Formats src->hosts into a json object conforming to the 'SocketAddress' type
  * in qemu.
  */
 static virJSONValue *
-qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src,
-                                                  bool legacy)
+qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src)
 {
     g_autoptr(virJSONValue) servers = NULL;
     g_autoptr(virJSONValue) server = NULL;
@@ -515,7 +496,7 @@ qemuBlockStorageSourceBuildHostsJSONSocketAddress(virStorageSource *src,
     for (i = 0; i < src->nhosts; i++) {
         host = src->hosts + i;

-        if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(host, legacy)))
+        if (!(server = qemuBlockStorageSourceBuildJSONSocketAddress(host)))
               return NULL;

         if (virJSONValueArrayAppend(servers, &server) < 0)
@@ -614,13 +595,12 @@ qemuBlockStorageSourceBuildHostsJSONInetSocketAddress(virStorageSource *src)

 static virJSONValue *
 qemuBlockStorageSourceGetGlusterProps(virStorageSource *src,
-                                      bool legacy,
                                       bool onlytarget)
 {
     g_autoptr(virJSONValue) servers = NULL;
     g_autoptr(virJSONValue) props = NULL;

-    if (!(servers = qemuBlockStorageSourceBuildHostsJSONSocketAddress(src, legacy)))
+    if (!(servers = qemuBlockStorageSourceBuildHostsJSONSocketAddress(src)))
         return NULL;

      /* { driver:"gluster",
@@ -851,9 +831,7 @@ qemuBlockStorageSourceGetNBDProps(virStorageSource *src,
         return NULL;
     }

-    serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0],
-                                                               false);
-    if (!serverprops)
+    if (!(serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0])))
         return NULL;

     if (onlytarget) {
@@ -952,9 +930,7 @@ qemuBlockStorageSourceGetSheepdogProps(virStorageSource *src)
         return NULL;
     }

-    serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0],
-                                                               false);
-    if (!serverprops)
+    if (!(serverprops = qemuBlockStorageSourceBuildJSONSocketAddress(&src->hosts[0])))
         return NULL;

     /* libvirt does not support the 'snap-id' and 'tag' properties */
@@ -1192,7 +1168,7 @@ qemuBlockStorageSourceGetBackendProps(virStorageSource *src,
         switch ((virStorageNetProtocol) src->protocol) {
         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
             driver = "gluster";
-            if (!(fileprops = qemuBlockStorageSourceGetGlusterProps(src, legacy, onlytarget)))
+            if (!(fileprops = qemuBlockStorageSourceGetGlusterProps(src, onlytarget)))
                 return NULL;
             break;

@@ -2613,7 +2589,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorageSource *src,
         switch ((virStorageNetProtocol) src->protocol) {
         case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
             driver = "gluster";
-            if (!(location = qemuBlockStorageSourceGetGlusterProps(src, false, false)))
+            if (!(location = qemuBlockStorageSourceGetGlusterProps(src, false)))
                 return -1;
             break;

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:57 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:57 +0200
Subject: [PATCH 19/80] qemu: capabilities: Retire
 QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <85867e091a89dc36776d65843d84228173faa7b2.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 src/qemu/qemu_process.c                           | 6 ++----
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 tests/testutilsqemu.c                             | 1 -
 30 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d660b3b9f0..5ef2997ed4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -595,7 +595,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "intel-iommu.aw-bits", /* QEMU_CAPS_INTEL_IOMMU_AW_BITS */
               "spapr-tpm-proxy", /* QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY */
               "numa.hmat", /* QEMU_CAPS_NUMA_HMAT */
-              "blockdev-hostdev-scsi", /* QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI */
+              "blockdev-hostdev-scsi", /* X_QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI */

               /* 380 */
               "usb-host.hostdevice", /* QEMU_CAPS_USB_HOST_HOSTDEVICE */
@@ -5228,7 +5228,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
     /* While the removal of pre-blockdev code is in progress we always hard-code
      * the support for QEMU_CAPS_BLOCKDEV */
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);

     /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
      * should be built with gcrypt to achieve FIPS compliance
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5ca177b599..89aa63cffe 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -574,7 +574,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_INTEL_IOMMU_AW_BITS, /* intel-iommu.aw-bits */
     QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY, /* -device spapr-tpm-proxy */
     QEMU_CAPS_NUMA_HMAT, /* -numa hmat */
-    QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI, /* -blockdev used for (i)SCSI hostdevs */
+    X_QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI, /* -blockdev used for (i)SCSI hostdevs */

     /* 380 */
     QEMU_CAPS_USB_HOST_HOSTDEVICE, /* -device usb-host.hostdevice */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 260116dc67..980e06ce79 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5646,8 +5646,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)

             /* The code is being cleaned up to always assume the support for
              * -blockdev thus we must no longer allow users to clear it */
-            if (tmp == QEMU_CAPS_BLOCKDEV ||
-                tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
+            if (tmp == QEMU_CAPS_BLOCKDEV)
                 continue;

             virQEMUCapsClear(priv->qemuCaps, tmp);
@@ -5676,8 +5675,7 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)

             /* The code is being cleaned up to always assume the support for
              * -blockdev thus we must no longer allow users to clear it */
-            if (tmp == QEMU_CAPS_BLOCKDEV ||
-                tmp == QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)
+            if (tmp == QEMU_CAPS_BLOCKDEV)
                 continue;

             virQEMUCapsClear(priv->qemuCaps, tmp);
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index e1f69fbcde..1d16f61a72 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -138,7 +138,6 @@
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
   <flag name='pvscsi'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index c78ae4ee45..8a64694a8d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -139,7 +139,6 @@
   <flag name='tcg'/>
   <flag name='pvscsi'/>
   <flag name='spapr-tpm-proxy'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 8c88873fc5..9b80f2b915 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -105,7 +105,6 @@
   <flag name='fsdev.multidevs'/>
   <flag name='virtio.packed'/>
   <flag name='tcg'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 5fb954a7d2..b8ac4b3799 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -180,7 +180,6 @@
   <flag name='pvscsi'/>
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='virtio-pmem-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c4e2fb70aa..10a3a1024d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -148,7 +148,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 2c10b10122..94cdb860c4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -154,7 +154,6 @@
   <flag name='pvscsi'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c170036059..49c4021e58 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -141,7 +141,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index bf43ded774..2070c01937 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -187,7 +187,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='dc390'/>
   <flag name='am53c974'/>
   <flag name='virtio-pmem-pci'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index ce86189e15..b7c835bb14 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -64,7 +64,6 @@
   <flag name='aio.io_uring'/>
   <flag name='tcg'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='netdev.vhost-vdpa'/>
   <flag name='ncr53c90'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index ea5df78e4b..b68f5857b4 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 174bd93bf2..e9df6a479e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -148,7 +148,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index 61ae1574e4..aa7bd3b392 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -152,7 +152,6 @@
   <flag name='pvscsi'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 612c73b851..61fbbcfd91 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -139,7 +139,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 2cb60c98c8..3ed4721e55 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -109,7 +109,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 087b721a61..cc5bccabe2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index ca3dca4369..416ed10e6d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -148,7 +148,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 65cb666714..e5d7782874 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -108,7 +108,6 @@
   <flag name='tcg'/>
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index aabcac1f5d..dfb2caa06e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 5d398181c2..161725a1e4 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index ec1a2d9cca..7034e01a3d 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -157,7 +157,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 52b0af3d6e..8c1c8e0904 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -151,7 +151,6 @@
   <flag name='pvscsi'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
   <flag name='netdev.vhost-vdpa'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 243fb41ca8..606eb10e8c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 5700c5e06b..ad4b64f2a8 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -158,7 +158,6 @@
   <flag name='virtio-blk-pci.scsi.default.disabled'/>
   <flag name='pvscsi'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index b2d48cc081..0bceeba596 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -161,7 +161,6 @@
   <flag name='pvscsi'/>
   <flag name='spapr-tpm-proxy'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 528be3c459..6ae458e577 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index a9cc271892..69b5ae7958 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -186,7 +186,6 @@
   <flag name='cpu.migratable'/>
   <flag name='intel-iommu.aw-bits'/>
   <flag name='numa.hmat'/>
-  <flag name='blockdev-hostdev-scsi'/>
   <flag name='usb-host.hostdevice'/>
   <flag name='virtio-balloon.free-page-reporting'/>
   <flag name='block-export-add'/>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index d44dc09219..c34cb878de 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -858,7 +858,6 @@ testQemuInfoSetArgs(struct testQemuInfo *info,

     /* until removal of the flags is completed we force them also in tests */
     virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV);
-    virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI);

     info->conf = conf;
     info->args.newargs = true;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:02 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:02 +0200
Subject: [PATCH 24/80] qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_DEL
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <990000ff09659cb41de0df111ee7e34e1b229af4.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5ef2997ed4..b91f46bb12 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -487,7 +487,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

               /* 300 */
               "hda-output", /* QEMU_CAPS_HDA_OUTPUT */
-              "blockdev-del", /* QEMU_CAPS_BLOCKDEV_DEL */
+              "blockdev-del", /* X_QEMU_CAPS_BLOCKDEV_DEL */
               "vmgenid", /* QEMU_CAPS_DEVICE_VMGENID */
               "vhost-vsock", /* QEMU_CAPS_DEVICE_VHOST_VSOCK */
               "chardev-fd-pass", /* X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE */
@@ -1213,7 +1213,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES },
     { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST },
     { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES },
-    { "blockdev-del", QEMU_CAPS_BLOCKDEV_DEL },
     { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
     { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
     { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 89aa63cffe..5f982b11d5 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -466,7 +466,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

     /* 300 */
     QEMU_CAPS_HDA_OUTPUT, /* -device hda-output */
-    QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
+    X_QEMU_CAPS_BLOCKDEV_DEL, /* blockdev-del is supported */
     QEMU_CAPS_DEVICE_VMGENID, /* -device vmgenid */
     QEMU_CAPS_DEVICE_VHOST_VSOCK, /* -device vhost-vsock-* */
     X_QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE, /* Passing pre-opened FDs for chardevs on commandline */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 1d16f61a72..419a987068 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -108,7 +108,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 8a64694a8d..ceaedd3863 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -106,7 +106,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
   <flag name='machine.pseries.cap-htm'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 9b80f2b915..d1ed2a781c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -76,7 +76,6 @@
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index b8ac4b3799..784a837e91 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -140,7 +140,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 10a3a1024d..b67c55b192 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -110,7 +110,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 94cdb860c4..5527659aaa 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -108,7 +108,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 49c4021e58..e8e6ab7e9d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -107,7 +107,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 2070c01937..d08eadc5b4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -140,7 +140,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index b7c835bb14..a971ccf740 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -41,7 +41,6 @@
   <flag name='qom-list-properties'/>
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='egl-headless'/>
   <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index b68f5857b4..8a33f277ab 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -139,7 +139,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index e9df6a479e..83d814613d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -109,7 +109,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index aa7bd3b392..fd07ed826e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -106,7 +106,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 61fbbcfd91..7c3adbe8b1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -105,7 +105,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 3ed4721e55..edadf9ff2c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -74,7 +74,6 @@
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index cc5bccabe2..838add4a26 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -139,7 +139,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 416ed10e6d..f59c32fe9d 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -110,7 +110,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index e5d7782874..e39ec10987 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -74,7 +74,6 @@
   <flag name='virtual-css-bridge.cssid-unrestricted'/>
   <flag name='vfio-ccw'/>
   <flag name='screendump_device'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index dfb2caa06e..89f397c458 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -138,7 +138,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 161725a1e4..f372d93e28 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -137,7 +137,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 7034e01a3d..9e847c3dcd 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -117,7 +117,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 8c1c8e0904..da23234b5b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -106,7 +106,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 606eb10e8c..1e88f23deb 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -137,7 +137,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index ad4b64f2a8..92b996df23 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -117,7 +117,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 0bceeba596..24dae3160c 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -112,7 +112,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 6ae458e577..2cf01d010e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -137,7 +137,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 69b5ae7958..c6089f29a0 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -137,7 +137,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='hda-output'/>
-  <flag name='blockdev-del'/>
   <flag name='vmgenid'/>
   <flag name='vhost-vsock'/>
   <flag name='tpm-emulator'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:00 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:00 +0200
Subject: [PATCH 22/80] qemuMigrationSrcNBDStorageCopyBlockdev: Remove some
 arguments
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <7c4168c5aee6dab813e83eaa575c75bf9c311e1e.1658843187.git.pkrempa@redhat.com>

We no longer need the arguments which were conditionally filled based on
presence of the QEMU_CAPS_BLOCKDEV feature.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index ef24a1dedf..042e8bb10a 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1025,9 +1025,6 @@ static int
 qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
                                        virDomainObj *vm,
                                        virDomainDiskDef *disk,
-                                       const char *jobname,
-                                       const char *sourcename,
-                                       bool persistjob,
                                        const char *host,
                                        int port,
                                        const char *socket,
@@ -1041,6 +1038,10 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
     qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     int mon_ret = 0;
     g_autoptr(virStorageSource) copysrc = NULL;
+    g_autofree char *diskAlias = qemuAliasDiskDriveFromDisk(disk);
+
+    if (!diskAlias)
+        return -1;

     VIR_DEBUG("starting blockdev mirror for disk=%s to host=%s", disk->dst, host);

@@ -1062,8 +1063,9 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
     mon_ret = qemuBlockStorageSourceAttachApply(qemuDomainGetMonitor(vm), data);

     if (mon_ret == 0)
-        mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), jobname, persistjob,
-                                            sourcename, copysrc->nodeformat,
+        mon_ret = qemuMonitorBlockdevMirror(qemuDomainGetMonitor(vm), diskAlias, true,
+                                            qemuDomainDiskGetTopNodename(disk),
+                                            copysrc->nodeformat,
                                             mirror_speed, 0, 0, mirror_shallow,
                                             syncWrites);

@@ -1109,9 +1111,7 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver,
     qemuBlockJobSyncBegin(job);

     rc = qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm,
-                                                disk, diskAlias,
-                                                qemuDomainDiskGetTopNodename(disk),
-                                                true,
+                                                disk,
                                                 host, port, socket,
                                                 mirror_speed,
                                                 mirror_shallow,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:03 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:03 +0200
Subject: [PATCH 25/80] qemu: snapshot: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <25a3e3f3f6839b8a79d88b3542d50d96c7dfcf59.1658843187.git.pkrempa@redhat.com>

Assume that QEMU_CAPS_BLOCKDEV is present and remove all code executed
when it's not.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_snapshot.c | 116 +++++----------------------------------
 1 file changed, 15 insertions(+), 101 deletions(-)

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 0733d44faa..b96ef7a50b 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -449,8 +449,7 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDef *snapdisk,
 static int
 qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
                                       virDomainSnapshotDiskDef *snapdisk,
-                                      virDomainDiskDef *domdisk,
-                                      bool blockdev)
+                                      virDomainDiskDef *domdisk)
 {
     virStorageType actualType = virStorageSourceGetActualType(snapdisk->src);

@@ -470,38 +469,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
     switch (actualType) {
     case VIR_STORAGE_TYPE_BLOCK:
     case VIR_STORAGE_TYPE_FILE:
-        break;
-
     case VIR_STORAGE_TYPE_NETWORK:
-        /* defer all of the checking to either qemu or libvirt's blockdev code */
-        if (blockdev)
-            break;
-
-        switch ((virStorageNetProtocol) snapdisk->src->protocol) {
-        case VIR_STORAGE_NET_PROTOCOL_GLUSTER:
-            break;
-
-        case VIR_STORAGE_NET_PROTOCOL_NONE:
-        case VIR_STORAGE_NET_PROTOCOL_NBD:
-        case VIR_STORAGE_NET_PROTOCOL_RBD:
-        case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-        case VIR_STORAGE_NET_PROTOCOL_ISCSI:
-        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_SSH:
-        case VIR_STORAGE_NET_PROTOCOL_VXHS:
-        case VIR_STORAGE_NET_PROTOCOL_NFS:
-        case VIR_STORAGE_NET_PROTOCOL_LAST:
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("external active snapshots are not supported on "
-                             "'network' disks using '%s' protocol"),
-                           virStorageNetProtocolTypeToString(snapdisk->src->protocol));
-            return -1;
-
-        }
         break;

     case VIR_STORAGE_TYPE_DIR:
@@ -528,17 +496,8 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm,
                                 virDomainDiskDef *disk,
                                 virDomainSnapshotDiskDef *snapdisk,
                                 bool active,
-                                bool reuse,
-                                bool blockdev)
+                                bool reuse)
 {
-
-    if (disk->src->readonly && !(reuse || blockdev)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("external snapshot for readonly disk %s "
-                         "is not supported"), disk->dst);
-        return -1;
-    }
-
     if (qemuTranslateSnapshotDiskSourcePool(snapdisk) < 0)
         return -1;

@@ -549,7 +508,7 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm,
         if (qemuSnapshotPrepareDiskExternalInactive(snapdisk, disk) < 0)
             return -1;
     } else {
-        if (qemuSnapshotPrepareDiskExternalActive(vm, snapdisk, disk, blockdev) < 0)
+        if (qemuSnapshotPrepareDiskExternalActive(vm, snapdisk, disk) < 0)
             return -1;
     }

@@ -679,8 +638,6 @@ qemuSnapshotPrepare(virDomainObj *vm,
                     bool *has_manual,
                     unsigned int *flags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     size_t i;
     bool active = virDomainObjIsActive(vm);
     bool reuse = (*flags & VIR_DOMAIN_SNAPSHOT_CREATE_REUSE_EXT) != 0;
@@ -742,16 +699,10 @@ qemuSnapshotPrepare(virDomainObj *vm,
                                    _("metadata cache max size control is supported only with qcow2 images"));
                     return -1;
                 }
-
-                if (!blockdev) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                   _("metadata cache max size control is not supported with this QEMU binary"));
-                    return -1;
-                }
             }

             if (qemuSnapshotPrepareDiskExternal(vm, dom_disk, disk,
-                                                active, reuse, blockdev) < 0)
+                                                active, reuse) < 0)
                 return -1;

             external++;
@@ -1059,10 +1010,7 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *snapctxt,
     virDomainObj *vm = snapctxt->vm;
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     virDomainDiskDef *persistdisk;
-    bool supportsCreate;
-    bool updateRelativeBacking = false;
     qemuSnapshotDiskData *dd = snapctxt->dd + snapctxt->ndd++;

     dd->disk = disk;
@@ -1092,28 +1040,15 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *snapctxt,
             return -1;
     }

-    supportsCreate = virStorageSourceSupportsCreate(dd->src);
-
-    /* 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 &&
-        virStorageSourceSupportsBackingChainTraversal(dd->src))
-        updateRelativeBacking = true;
-
-    if (supportsCreate || updateRelativeBacking) {
+    if (virStorageSourceSupportsCreate(dd->src)) {
         if (qemuDomainStorageFileInit(driver, vm, dd->src, NULL) < 0)
             return -1;

         dd->initialized = true;

-        if (reuse) {
-            if (updateRelativeBacking &&
-                virStorageSourceFetchRelativeBackingPath(dd->src, &dd->relPath) < 0)
-                return -1;
-        } else {
+        if (!reuse) {
             /* pre-create the image file so that we can label it before handing it to qemu */
-            if (supportsCreate && dd->src->type != VIR_STORAGE_TYPE_BLOCK) {
+            if (dd->src->type != VIR_STORAGE_TYPE_BLOCK) {
                 if (virStorageSourceCreate(dd->src) < 0) {
                     virReportSystemError(errno, _("failed to create image file '%s'"),
                                          NULLSTR(dd->src->path));
@@ -1131,20 +1066,15 @@ qemuSnapshotDiskPrepareOne(qemuSnapshotDiskContext *snapctxt,

     dd->prepared = true;

-    if (blockdev) {
-        if (qemuSnapshotDiskPrepareOneBlockdev(driver, vm, dd, snapctxt->cfg, reuse,
-                                               blockNamedNodeData, snapctxt->asyncJob) < 0)
-            return -1;
+    if (qemuSnapshotDiskPrepareOneBlockdev(driver, vm, dd, snapctxt->cfg, reuse,
+                                           blockNamedNodeData, snapctxt->asyncJob) < 0)
+        return -1;

-        if (qemuSnapshotDiskBitmapsPropagate(dd, snapctxt->actions, blockNamedNodeData) < 0)
-            return -1;
+    if (qemuSnapshotDiskBitmapsPropagate(dd, snapctxt->actions, blockNamedNodeData) < 0)
+        return -1;

-        if (qemuBlockSnapshotAddBlockdev(snapctxt->actions, dd->disk, dd->src) < 0)
-            return -1;
-    } else {
-        if (qemuBlockSnapshotAddLegacy(snapctxt->actions, dd->disk, dd->src, reuse) < 0)
-            return -1;
-    }
+    if (qemuBlockSnapshotAddBlockdev(snapctxt->actions, dd->disk, dd->src) < 0)
+        return -1;

     return 0;
 }
@@ -1211,17 +1141,6 @@ qemuSnapshotGetTransientDiskDef(virDomainDiskDef *domdisk,
 }


-static void
-qemuSnapshotDiskUpdateSourceRenumber(virStorageSource *src)
-{
-    virStorageSource *next;
-    unsigned int idx = 1;
-
-    for (next = src->backingStore; virStorageSourceIsBacking(next); next = next->backingStore)
-        next->id = idx++;
-}
-
-
 /**
  * qemuSnapshotDiskUpdateSource:
  * @vm: domain object
@@ -1257,10 +1176,6 @@ qemuSnapshotDiskUpdateSource(virDomainObj *vm,
     dd->src->backingStore = g_steal_pointer(&dd->disk->src);
     dd->disk->src = g_steal_pointer(&dd->src);

-    /* fix numbering of disks */
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        qemuSnapshotDiskUpdateSourceRenumber(dd->disk->src);
-
     if (dd->persistdisk) {
         dd->persistdisk->src->readonly = true;
         dd->persistsrc->backingStore = g_steal_pointer(&dd->persistdisk->src);
@@ -1415,8 +1330,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
     /* We need to collect reply from 'query-named-block-nodes' prior to the
      * migration step as qemu deactivates bitmaps after migration so the result
      * would be wrong */
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        !(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, VIR_ASYNC_JOB_SNAPSHOT)))
+    if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, VIR_ASYNC_JOB_SNAPSHOT)))
         goto cleanup;

     /* do the memory snapshot if necessary */
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:04 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:04 +0200
Subject: [PATCH 26/80] qemu: Remove unused code for pre-blockdev disk snapshot
 monitor interaction
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <9a9d305353f72894a502bdfdb2abe749e02ce7aa.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c        | 20 --------------------
 src/qemu/qemu_block.h        |  6 ------
 src/qemu/qemu_monitor.c      | 12 ------------
 src/qemu/qemu_monitor.h      |  6 ------
 src/qemu/qemu_monitor_json.c | 22 ----------------------
 src/qemu/qemu_monitor_json.h |  6 ------
 tests/qemumonitorjsontest.c  |  1 -
 7 files changed, 73 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 870d44ecd5..81c807660f 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -2108,26 +2108,6 @@ qemuBlockStorageSourceDetachOneBlockdev(virQEMUDriver *driver,
 }


-int
-qemuBlockSnapshotAddLegacy(virJSONValue *actions,
-                           virDomainDiskDef *disk,
-                           virStorageSource *newsrc,
-                           bool reuse)
-{
-    const char *format = virStorageFileFormatTypeToString(newsrc->format);
-    g_autofree char *device = NULL;
-    g_autofree char *source = NULL;
-
-    if (!(device = qemuAliasDiskDriveFromDisk(disk)))
-        return -1;
-
-    if (qemuGetDriveSourceString(newsrc, NULL, &source) < 0)
-        return -1;
-
-    return qemuMonitorTransactionSnapshotLegacy(actions, device, source, format, reuse);
-}
-
-
 int
 qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
                              virDomainDiskDef *disk,
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 8641c8a2d2..bcd3f5960b 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -179,12 +179,6 @@ qemuBlockStorageSourceChainDetach(qemuMonitor *mon,
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockStorageSourceChainData,
                         qemuBlockStorageSourceChainDataFree);

-int
-qemuBlockSnapshotAddLegacy(virJSONValue *actions,
-                           virDomainDiskDef *disk,
-                           virStorageSource *newsrc,
-                           bool reuse);
-
 int
 qemuBlockSnapshotAddBlockdev(virJSONValue *actions,
                              virDomainDiskDef *disk,
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 6ebdeb46f3..b575eaae06 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4397,18 +4397,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
 }


-int
-qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions,
-                                     const char *device,
-                                     const char *path,
-                                     const char *format,
-                                     bool existing)
-{
-    return qemuMonitorJSONTransactionSnapshotLegacy(actions, device, path,
-                                                    format, existing);
-}
-
-
 int
 qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions,
                                        const char *node,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index b82f198285..916a86f423 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1461,12 +1461,6 @@ qemuMonitorTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
                                                  const char *sourcebitmap);

 int
-qemuMonitorTransactionSnapshotLegacy(virJSONValue *actions,
-                                     const char *device,
-                                     const char *path,
-                                     const char *format,
-                                     bool existing);
-int
 qemuMonitorTransactionSnapshotBlockdev(virJSONValue *actions,
                                        const char *node,
                                        const char *overlay);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 941596563a..8cda6f36b7 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -8548,28 +8548,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
 }


-int
-qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions,
-                                         const char *device,
-                                         const char *path,
-                                         const char *format,
-                                         bool existing)
-{
-    const char *mode = NULL;
-
-    if (existing)
-        mode = "existing";
-
-    return qemuMonitorJSONTransactionAdd(actions,
-                                         "blockdev-snapshot-sync",
-                                         "s:device", device,
-                                         "s:snapshot-file", path,
-                                         "s:format", format,
-                                         "S:mode", mode,
-                                         NULL);
-}
-
-
 int
 qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions,
                                            const char *node,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index e4c65e250e..613b251908 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -813,12 +813,6 @@ qemuMonitorJSONTransactionBitmapMergeSourceAddBitmap(virJSONValue *sources,
                                                      const char *sourcebitmap);

 int
-qemuMonitorJSONTransactionSnapshotLegacy(virJSONValue *actions,
-                                         const char *device,
-                                         const char *path,
-                                         const char *format,
-                                         bool existing);
-int
 qemuMonitorJSONTransactionSnapshotBlockdev(virJSONValue *actions,
                                            const char *node,
                                            const char *overlay);
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 692aa75791..adfe6e1c55 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2742,7 +2742,6 @@ testQemuMonitorJSONTransaction(const void *opaque)
         qemuMonitorTransactionBitmapEnable(actions, "node3", "bitmap3") < 0 ||
         qemuMonitorTransactionBitmapDisable(actions, "node4", "bitmap4") < 0 ||
         qemuMonitorTransactionBitmapMerge(actions, "node5", "bitmap5", &mergebitmaps) < 0 ||
-        qemuMonitorTransactionSnapshotLegacy(actions, "dev6", "path", "qcow2", true) < 0 ||
         qemuMonitorTransactionSnapshotBlockdev(actions, "node7", "overlay7") < 0 ||
         qemuMonitorTransactionBackup(actions, "dev8", "job8", "target8", "bitmap8",
                                      QEMU_MONITOR_TRANSACTION_BACKUP_SYNC_MODE_NONE) < 0 ||
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:56 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:56 +0200
Subject: [PATCH 18/80] qemu: Remove code conditional on
 QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <c67302c2c955fcf3c702bc4f006dc085cdef5cbe.1658843187.git.pkrempa@redhat.com>

Now that QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI is always set we can remove the
code which handled cases when the capability was not set.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 142 +++++++++++-----------------------------
 src/qemu/qemu_domain.c  |  18 ++---
 2 files changed, 43 insertions(+), 117 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index cb54190780..e0c5e15a63 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5091,27 +5091,6 @@ qemuBuildHubCommandLine(virCommand *cmd,
 }


-static char *
-qemuBuildSCSIiSCSIHostdevDrvStr(virDomainHostdevDef *dev)
-{
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    g_autoptr(virJSONValue) srcprops = NULL;
-    virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi;
-    virDomainHostdevSubsysSCSIiSCSI *iscsisrc = &scsisrc->u.iscsi;
-
-    if (!(srcprops = qemuDiskSourceGetProps(iscsisrc->src)))
-        return NULL;
-
-    if (virQEMUBuildCommandLineJSON(srcprops, &buf, NULL,
-                                    virQEMUBuildCommandLineJSONArrayNumbered) < 0)
-        return NULL;
-
-    virBufferAddLit(&buf, ",if=none,format=raw");
-
-    return virBufferContentAndReset(&buf);
-}
-
-
 virJSONValue *
 qemuBuildSCSIVHostHostdevDevProps(const virDomainDef *def,
                                   virDomainHostdevDef *dev,
@@ -5138,32 +5117,6 @@ qemuBuildSCSIVHostHostdevDevProps(const virDomainDef *def,
 }


-static char *
-qemuBuildSCSIHostdevDrvStr(virDomainHostdevDef *dev)
-{
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    g_autofree char *source = NULL;
-    g_autofree char *drivealias = NULL;
-    virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi;
-
-    if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
-        if (!(source = qemuBuildSCSIiSCSIHostdevDrvStr(dev)))
-            return NULL;
-        virBufferAdd(&buf, source, -1);
-    } else {
-        virBufferAsprintf(&buf, "file=%s,if=none,format=raw", scsisrc->u.host.src->path);
-    }
-
-    if (!(drivealias = qemuAliasFromHostdev(dev)))
-        return NULL;
-    virBufferAsprintf(&buf, ",id=%s", drivealias);
-
-    if (dev->readonly)
-        virBufferAddLit(&buf, ",readonly=on");
-
-    return virBufferContentAndReset(&buf);
-}
-
 virJSONValue *
 qemuBuildSCSIHostdevDevProps(const virDomainDef *def,
                              virDomainHostdevDef *dev,
@@ -5286,41 +5239,34 @@ qemuBuildHostdevMediatedDevProps(const virDomainDef *def,

 qemuBlockStorageSourceAttachData *
 qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev,
-                                  virQEMUCaps *qemuCaps)
+                                  virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 {
     virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi;
     g_autoptr(qemuBlockStorageSourceAttachData) ret = g_new0(qemuBlockStorageSourceAttachData, 1);
+    virStorageSource *src;
+    qemuDomainStorageSourcePrivate *srcpriv;

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) {
-        virStorageSource *src;
-        qemuDomainStorageSourcePrivate *srcpriv;
-
-        switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) {
-        case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE:
-            src = scsisrc->u.host.src;
-            break;
-
-        case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI:
-            src = scsisrc->u.iscsi.src;
-            break;
+    switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) {
+    case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE:
+        src = scsisrc->u.host.src;
+        break;

-        case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST:
-        default:
-            virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc->protocol);
-            return NULL;
-        }
+    case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI:
+        src = scsisrc->u.iscsi.src;
+        break;

-        srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
-        ret->storageNodeName = src->nodestorage;
-        ret->storageAttached = true;
+    case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST:
+    default:
+        virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc->protocol);
+        return NULL;
+    }

-        if (srcpriv && srcpriv->secinfo)
-            ret->authsecretAlias = g_strdup(srcpriv->secinfo->alias);
+    srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
+    ret->storageNodeName = src->nodestorage;
+    ret->storageAttached = true;

-    } else {
-        ret->driveAlias = qemuAliasFromHostdev(hostdev);
-        ret->driveAdded = true;
-    }
+    if (srcpriv && srcpriv->secinfo)
+        ret->authsecretAlias = g_strdup(srcpriv->secinfo->alias);

     return g_steal_pointer(&ret);
 }
@@ -5329,45 +5275,35 @@ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev,
 qemuBlockStorageSourceAttachData *
 qemuBuildHostdevSCSIAttachPrepare(virDomainHostdevDef *hostdev,
                                   const char **backendAlias,
-                                  virQEMUCaps *qemuCaps)
+                                  virQEMUCaps *qemuCaps G_GNUC_UNUSED)
 {
     virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi;
     g_autoptr(qemuBlockStorageSourceAttachData) ret = g_new0(qemuBlockStorageSourceAttachData, 1);
     virStorageSource *src = NULL;

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) {
-        switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) {
-        case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE:
-            src = scsisrc->u.host.src;
-            break;
-
-        case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI:
-            src = scsisrc->u.iscsi.src;
-            break;
+    switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) {
+    case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE:
+        src = scsisrc->u.host.src;
+        break;

-        case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST:
-        default:
-            virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc->protocol);
-            return NULL;
-        }
+    case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI:
+        src = scsisrc->u.iscsi.src;
+        break;

-        ret->storageNodeName = src->nodestorage;
-        *backendAlias = src->nodestorage;
+    case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_LAST:
+    default:
+        virReportEnumRangeError(virDomainHostdevSCSIProtocolType, scsisrc->protocol);
+        return NULL;
+    }

-        if (!(ret->storageProps = qemuBlockStorageSourceGetBackendProps(src,
-                                                                        QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP)))
-            return NULL;
+    ret->storageNodeName = src->nodestorage;
+    *backendAlias = src->nodestorage;

-    } else {
-        if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)
-            src = scsisrc->u.iscsi.src;
-        ret->driveCmd = qemuBuildSCSIHostdevDrvStr(hostdev);
-        ret->driveAlias = qemuAliasFromHostdev(hostdev);
-        *backendAlias = ret->driveAlias;
-    }
+    if (!(ret->storageProps = qemuBlockStorageSourceGetBackendProps(src,
+                                                                    QEMU_BLOCK_STORAGE_SOURCE_BACKEND_PROPS_SKIP_UNMAP)))
+        return NULL;

-    if (src &&
-        qemuBuildStorageSourceAttachPrepareCommon(src, ret) < 0)
+    if (qemuBuildStorageSourceAttachPrepareCommon(src, ret) < 0)
         return NULL;

     return g_steal_pointer(&ret);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 245cae9c60..d45c5d30a9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5718,7 +5718,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(virDomainHostdevDef *hostdev,
  */
 static int
 qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *hostdev,
-                                                       virQEMUCaps *qemuCaps,
                                                        unsigned int parseFlags)
 {
     virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi;
@@ -5727,11 +5726,6 @@ qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(virDomainHostdevDef *host
     if (!(parseFlags & VIR_DOMAIN_DEF_PARSE_STATUS))
         return 0;

-    if (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
-        hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI ||
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI))
-        return 0;
-
     switch ((virDomainHostdevSCSIProtocolType) scsisrc->protocol) {
     case VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_NONE:
         if (!scsisrc->u.host.src)
@@ -5782,8 +5776,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDef *hostdev,
     if (qemuDomainDeviceHostdevDefPostParseRestoreSecAlias(hostdev, parseFlags) < 0)
         return -1;

-    if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, qemuCaps,
-                                                               parseFlags) < 0)
+    if (qemuDomainDeviceHostdevDefPostParseRestoreBackendAlias(hostdev, parseFlags) < 0)
         return -1;

     if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
@@ -11018,12 +11011,9 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev,
             const char *backendalias = hostdev->info->alias;

             src->readonly = hostdev->readonly;
-
-            if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) {
-                src->id = qemuDomainStorageIDNew(priv);
-                src->nodestorage = g_strdup_printf("libvirt-%d-backend", src->id);
-                backendalias = src->nodestorage;
-            }
+            src->id = qemuDomainStorageIDNew(priv);
+            src->nodestorage = g_strdup_printf("libvirt-%d-backend", src->id);
+            backendalias = src->nodestorage;

             if (src->auth) {
                 virSecretUsageType usageType = VIR_SECRET_USAGE_TYPE_ISCSI;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:01 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:01 +0200
Subject: [PATCH 23/80] qemu: migration: Assume support for
 QEMU_CAPS_BLOCKDEV_DEL
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <33d0ae820c82d4f6d0eeec1fdcc18b542979925d.1658843187.git.pkrempa@redhat.com>

The migration code was using few blockdev bits before blockdev was
fully integrated to allow TLS with NBD.

Since we now always use blockdev we can remove the check.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 042e8bb10a..16d65ff22e 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4803,14 +4803,6 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
                 host = spec->dest.host.name;
             }

-            /* Allow migration with TLS only when we also support TLS for the NBD connection */
-            if (flags & VIR_MIGRATE_TLS &&
-                !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_DEL)) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("NBD migration with TLS is not supported"));
-                goto error;
-            }
-
             if (qemuMigrationSrcNBDStorageCopy(driver, vm, mig,
                                                host,
                                                priv->migMaxBandwidth,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:36:59 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:36:59 +0200
Subject: [PATCH 21/80] qemu: migration: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <a8a01df23d140e8bc5f6bc80aca6e82efba13093.1658843187.git.pkrempa@redhat.com>

Assume that QEMU_CAPS_BLOCKDEV is present and remove all code executed
when it's not.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration.c | 127 ++++++++------------------------------
 1 file changed, 25 insertions(+), 102 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 8e9428a5bb..ef24a1dedf 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1080,46 +1080,6 @@ qemuMigrationSrcNBDStorageCopyBlockdev(virQEMUDriver *driver,
 }


-static int
-qemuMigrationSrcNBDStorageCopyDriveMirror(virQEMUDriver *driver,
-                                          virDomainObj *vm,
-                                          const char *diskAlias,
-                                          const char *host,
-                                          int port,
-                                          const char *socket,
-                                          unsigned long long mirror_speed,
-                                          bool mirror_shallow)
-{
-    g_autofree char *nbd_dest = NULL;
-    int mon_ret;
-
-    if (socket) {
-        nbd_dest = g_strdup_printf("nbd+unix:///%s?socket=%s",
-                                   diskAlias, socket);
-    } else if (strchr(host, ':')) {
-        nbd_dest = g_strdup_printf("nbd:[%s]:%d:exportname=%s", host, port,
-                                   diskAlias);
-    } else {
-        nbd_dest = g_strdup_printf("nbd:%s:%d:exportname=%s", host, port,
-                                   diskAlias);
-    }
-
-    if (qemuDomainObjEnterMonitorAsync(driver, vm,
-                                       VIR_ASYNC_JOB_MIGRATION_OUT) < 0)
-        return -1;
-
-    mon_ret = qemuMonitorDriveMirror(qemuDomainGetMonitor(vm),
-                                     diskAlias, nbd_dest, "raw",
-                                     mirror_speed, 0, 0, mirror_shallow, true);
-
-    qemuDomainObjExitMonitor(vm);
-    if (mon_ret < 0)
-        return -1;
-
-    return 0;
-}
-
-
 static int
 qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver,
                                   virDomainObj *vm,
@@ -1133,13 +1093,9 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver,
                                   const char *tlsHostname,
                                   unsigned int flags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
     qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     qemuBlockJobData *job = NULL;
     g_autofree char *diskAlias = NULL;
-    const char *jobname = NULL;
-    const char *sourcename = NULL;
-    bool persistjob = false;
     bool syncWrites = !!(flags & VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES);
     int rc;
     int ret = -1;
@@ -1150,35 +1106,18 @@ qemuMigrationSrcNBDStorageCopyOne(virQEMUDriver *driver,
     if (!(job = qemuBlockJobDiskNew(vm, disk, QEMU_BLOCKJOB_TYPE_COPY, diskAlias)))
         return -1;

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        jobname = diskAlias;
-        sourcename = qemuDomainDiskGetTopNodename(disk);
-        persistjob = true;
-    } else {
-        jobname = NULL;
-        sourcename = diskAlias;
-        persistjob = false;
-    }
-
     qemuBlockJobSyncBegin(job);

-    if (flags & VIR_MIGRATE_TLS ||
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        rc = qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm,
-                                                    disk, jobname,
-                                                    sourcename, persistjob,
-                                                    host, port, socket,
-                                                    mirror_speed,
-                                                    mirror_shallow,
-                                                    tlsAlias,
-                                                    tlsHostname,
-                                                    syncWrites);
-    } else {
-        rc = qemuMigrationSrcNBDStorageCopyDriveMirror(driver, vm, diskAlias,
-                                                       host, port, socket,
-                                                       mirror_speed,
-                                                       mirror_shallow);
-    }
+    rc = qemuMigrationSrcNBDStorageCopyBlockdev(driver, vm,
+                                                disk, diskAlias,
+                                                qemuDomainDiskGetTopNodename(disk),
+                                                true,
+                                                host, port, socket,
+                                                mirror_speed,
+                                                mirror_shallow,
+                                                tlsAlias,
+                                                tlsHostname,
+                                                syncWrites);

     if (rc == 0) {
         diskPriv->migrating = true;
@@ -2687,41 +2626,25 @@ qemuMigrationSrcBeginPhase(virQEMUDriver *driver,
     }

     if (flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)) {
-        if (flags & VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES &&
-            !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+        if (flags & VIR_MIGRATE_TUNNELLED) {
             virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                           _("VIR_MIGRATE_NON_SHARED_SYNCHRONOUS_WRITES is not supported by this QEMU"));
-            return NULL;
+                           _("migration of non-shared storage is not supported with tunnelled migration and this QEMU"));
         }

-        if (flags & VIR_MIGRATE_TUNNELLED) {
-            if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("migration of non-shared storage is not supported with tunnelled migration and this QEMU"));
-                return NULL;
-            }
-
-            if (nmigrate_disks) {
-                virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                               _("Selecting disks to migrate is not implemented for tunnelled migration"));
-                return NULL;
-            }
-        } else {
-            if (nmigrate_disks) {
-                size_t i, j;
-                /* Check user requested only known disk targets. */
-                for (i = 0; i < nmigrate_disks; i++) {
-                    for (j = 0; j < vm->def->ndisks; j++) {
-                        if (STREQ(vm->def->disks[j]->dst, migrate_disks[i]))
-                            break;
-                    }
+        if (nmigrate_disks) {
+            size_t i, j;
+            /* Check user requested only known disk targets. */
+            for (i = 0; i < nmigrate_disks; i++) {
+                for (j = 0; j < vm->def->ndisks; j++) {
+                    if (STREQ(vm->def->disks[j]->dst, migrate_disks[i]))
+                        break;
+                }

-                    if (j == vm->def->ndisks) {
-                        virReportError(VIR_ERR_INVALID_ARG,
-                                       _("disk target %s not found"),
-                                       migrate_disks[i]);
-                        return NULL;
-                    }
+                if (j == vm->def->ndisks) {
+                    virReportError(VIR_ERR_INVALID_ARG,
+                                   _("disk target %s not found"),
+                                   migrate_disks[i]);
+                    return NULL;
                 }
             }

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:09 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:09 +0200
Subject: [PATCH 31/80] qemu: blockjob: Remove legacy block job completion code
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <183415ee8fa261ada0b9dc30f59f51da5c15a1ea.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_blockjob.c | 136 +--------------------------------------
 1 file changed, 1 insertion(+), 135 deletions(-)

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index ed82ac5dc2..304008a31a 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -703,137 +703,6 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObj *vm,
 }


-static void
-qemuBlockJobEventProcessLegacyCompleted(virQEMUDriver *driver,
-                                        virDomainObj *vm,
-                                        qemuBlockJobData *job,
-                                        int asyncJob)
-{
-    virDomainDiskDef *disk = job->disk;
-
-    if (!disk)
-        return;
-
-    if (disk->mirrorState == VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT) {
-        qemuBlockJobRewriteConfigDiskSource(vm, disk, disk->mirror);
-        /* XXX We want to revoke security labels as well as audit that
-         * revocation, before dropping the original source.  But it gets
-         * tricky if both source and mirror share common backing files (we
-         * want to only revoke the non-shared portion of the chain); so for
-         * now, we leak the access to the original.  */
-        virDomainLockImageDetach(driver->lockManager, vm, disk->src);
-
-        /* Move secret driver metadata */
-        if (qemuSecurityMoveImageMetadata(driver, vm, disk->src, disk->mirror) < 0) {
-            VIR_WARN("Unable to move disk metadata on "
-                     "vm %s from %s to %s (disk target %s)",
-                     vm->def->name,
-                     NULLSTR(disk->src->path),
-                     NULLSTR(disk->mirror->path),
-                     disk->dst);
-        }
-
-        virObjectUnref(disk->src);
-        disk->src = disk->mirror;
-    } else {
-        if (disk->mirror) {
-            virDomainLockImageDetach(driver->lockManager, vm, disk->mirror);
-
-            /* Ideally, we would restore seclabels on the backing chain here
-             * but we don't know if somebody else is not using parts of it.
-             * Remove security driver metadata so that they are not leaked. */
-            qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
-
-            virObjectUnref(disk->mirror);
-        }
-
-        qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
-    }
-
-    /* Recompute the cached backing chain to match our
-     * updates.  Better would be storing the chain ourselves
-     * rather than reprobing, but we haven't quite completed
-     * that conversion to use our XML tracking. */
-    disk->mirror = NULL;
-    disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
-    disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
-    disk->src->id = 0;
-    virStorageSourceBackingStoreClear(disk->src);
-    ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true));
-    ignore_value(qemuBlockNodeNamesDetect(driver, vm, asyncJob));
-    qemuBlockJobUnregister(job, vm);
-    qemuDomainSaveConfig(vm);
-}
-
-
-/**
- * qemuBlockJobEventProcessLegacy:
- * @driver: qemu driver
- * @vm: domain
- * @job: job to process events for
- *
- * Update disk's mirror state in response to a block job event
- * from QEMU. For mirror state's that must survive libvirt
- * restart, also update the domain's status XML.
- */
-static void
-qemuBlockJobEventProcessLegacy(virQEMUDriver *driver,
-                               virDomainObj *vm,
-                               qemuBlockJobData *job,
-                               int asyncJob)
-{
-    virDomainDiskDef *disk = job->disk;
-
-    VIR_DEBUG("disk=%s, mirrorState=%s, type=%d, state=%d, newstate=%d",
-              disk->dst,
-              NULLSTR(virDomainDiskMirrorStateTypeToString(disk->mirrorState)),
-              job->type,
-              job->state,
-              job->newstate);
-
-    if (job->newstate == -1)
-        return;
-
-    qemuBlockJobEmitEvents(driver, vm, disk, job->type, job->newstate);
-
-    job->state = job->newstate;
-    job->newstate = -1;
-
-    /* If we completed a block pull or commit, then update the XML
-     * to match.  */
-    switch ((virConnectDomainEventBlockJobStatus) job->state) {
-    case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
-        qemuBlockJobEventProcessLegacyCompleted(driver, vm, job, asyncJob);
-        break;
-
-    case VIR_DOMAIN_BLOCK_JOB_READY:
-        disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY;
-        qemuDomainSaveStatus(vm);
-        break;
-
-    case VIR_DOMAIN_BLOCK_JOB_FAILED:
-    case VIR_DOMAIN_BLOCK_JOB_CANCELED:
-        if (disk->mirror) {
-            virDomainLockImageDetach(driver->lockManager, vm, disk->mirror);
-
-            /* Ideally, we would restore seclabels on the backing chain here
-             * but we don't know if somebody else is not using parts of it.
-             * Remove security driver metadata so that they are not leaked. */
-            qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
-
-            g_clear_pointer(&disk->mirror, virObjectUnref);
-        }
-        disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
-        disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
-        qemuBlockJobUnregister(job, vm);
-        break;
-
-    case VIR_DOMAIN_BLOCK_JOB_LAST:
-        break;
-    }
-}
-
-
 static void
 qemuBlockJobEventProcessConcludedRemoveChain(virQEMUDriver *driver,
                                              virDomainObj *vm,
@@ -1750,10 +1619,7 @@ qemuBlockJobUpdate(virDomainObj *vm,
     if (job->newstate == -1)
         return;

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        qemuBlockJobEventProcess(priv->driver, vm, job, asyncJob);
-    else
-        qemuBlockJobEventProcessLegacy(priv->driver, vm, job, asyncJob);
+    qemuBlockJobEventProcess(priv->driver, vm, job, asyncJob);
 }


-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:05 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:05 +0200
Subject: [PATCH 27/80] qemu: block: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <bce5e5098295a7da9853f4a4d43f9e4f331a6586.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_backup.c    |  2 +-
 src/qemu/qemu_block.c     | 10 +---------
 src/qemu/qemu_block.h     |  1 -
 src/qemu/qemu_migration.c |  2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index d2a5d2db5f..b90185a375 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -536,7 +536,7 @@ qemuBackupBeginPullExportDisks(virDomainObj *vm,
         if (!dd->backupdisk->exportname)
             dd->backupdisk->exportname = g_strdup(dd->domdisk->dst);

-        if (qemuBlockExportAddNBD(vm, NULL,
+        if (qemuBlockExportAddNBD(vm,
                                   dd->store,
                                   dd->backupdisk->exportname,
                                   false,
diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 81c807660f..141bf1b3e7 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -3534,21 +3534,18 @@ qemuBlockExportGetNBDProps(const char *nodename,
 /**
  * qemuBlockExportAddNBD:
  * @vm: domain object
- * @drivealias: (optional) alias of -drive to export in pre-blockdev configurations
  * @src: disk source to export
  * @exportname: name for the export
  * @writable: whether the NBD export allows writes
  * @bitmap: (optional) block dirty bitmap to export along
  *
  * This function automatically selects the proper invocation of exporting a
- * block backend via NBD in qemu. This includes use of nodename for blockdev
- * and proper configuration for the exportname for older qemus.
+ * block backend via NBD in qemu.
  *
  * This function must be called while in the monitor context.
  */
 int
 qemuBlockExportAddNBD(virDomainObj *vm,
-                      const char *drivealias,
                       virStorageSource *src,
                       const char *exportname,
                       bool writable,
@@ -3558,11 +3555,6 @@ qemuBlockExportAddNBD(virDomainObj *vm,
     g_autoptr(virJSONValue) nbdprops = NULL;
     const char *bitmaps[2] = { bitmap, NULL };

-    /* older qemu versions didn't support configuring the exportname and
-     * took the 'drivealias' as the export name */
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return qemuMonitorNBDServerAdd(priv->mon, drivealias, NULL, writable, NULL);
-
     if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_EXPORT_ADD))
         return qemuMonitorNBDServerAdd(priv->mon, src->nodeformat,
                                        exportname, writable, bitmap);
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index bcd3f5960b..b22a541797 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -291,7 +291,6 @@ qemuBlockExportGetNBDProps(const char *nodename,

 int
 qemuBlockExportAddNBD(virDomainObj *vm,
-                      const char *drivealias,
                       virStorageSource *src,
                       const char *exportname,
                       bool writable,
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 16d65ff22e..a6d097c304 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -614,7 +614,7 @@ qemuMigrationDstStartNBDServer(virQEMUDriver *driver,
             server_started = true;
         }

-        if (qemuBlockExportAddNBD(vm, diskAlias, disk->src, diskAlias, true, NULL) < 0)
+        if (qemuBlockExportAddNBD(vm, disk->src, diskAlias, true, NULL) < 0)
             goto exit_monitor;
         qemuDomainObjExitMonitor(vm);
     }
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:08 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:08 +0200
Subject: [PATCH 30/80] qemu: process: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <855f7d050d2bc7cb0adf6010136f11ec16ae72fe.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_process.c | 182 +---------------------------------------
 1 file changed, 2 insertions(+), 180 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 980e06ce79..6083ee10d8 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -873,50 +873,6 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectEventStateQueue(driver->domainEventState, lifecycleEvent);
 }

-static void
-qemuProcessHandleBlockJob(qemuMonitor *mon G_GNUC_UNUSED,
-                          virDomainObj *vm,
-                          const char *diskAlias,
-                          int type,
-                          int status,
-                          const char *error)
-{
-    qemuDomainObjPrivate *priv;
-    virDomainDiskDef *disk;
-    g_autoptr(qemuBlockJobData) job = NULL;
-
-    virObjectLock(vm);
-
-    priv = vm->privateData;
-
-    /* with QEMU_CAPS_BLOCKDEV we handle block job events via JOB_STATUS_CHANGE */
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        goto cleanup;
-
-    VIR_DEBUG("Block job for device %s (domain: %p,%s) type %d status %d",
-              diskAlias, vm, vm->def->name, type, status);
-
-    if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL)))
-        goto cleanup;
-
-    job = qemuBlockJobDiskGetJob(disk);
-
-    if (job && job->synchronous) {
-        /* We have a SYNC API waiting for this event, dispatch it back */
-        job->newstate = status;
-        VIR_FREE(job->errmsg);
-        job->errmsg = g_strdup(error);
-        virDomainObjBroadcast(vm);
-    } else {
-        /* there is no waiting SYNC API, dispatch the update to a thread */
-        qemuProcessEventSubmit(vm, QEMU_PROCESS_EVENT_BLOCK_JOB,
-                               type, status, g_strdup(diskAlias));
-    }
-
- cleanup:
-    virObjectUnlock(vm);
-}
-

 static void
 qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED,
@@ -935,11 +891,6 @@ qemuProcessHandleJobStatusChange(qemuMonitor *mon G_GNUC_UNUSED,
               jobname, vm, vm->def->name,
               qemuMonitorJobStatusTypeToString(status), status);

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        VIR_DEBUG("job '%s' handled by old blockjob handler", jobname);
-        goto cleanup;
-    }
-
     if ((jobnewstate = qemuBlockjobConvertMonitorStatus(status)) == QEMU_BLOCKJOB_STATE_LAST)
         goto cleanup;

@@ -1822,7 +1773,6 @@ static qemuMonitorCallbacks monitorCallbacks = {
     .domainWatchdog = qemuProcessHandleWatchdog,
     .domainIOError = qemuProcessHandleIOError,
     .domainGraphics = qemuProcessHandleGraphics,
-    .domainBlockJob = qemuProcessHandleBlockJob,
     .jobStatusChange = qemuProcessHandleJobStatusChange,
     .domainTrayChange = qemuProcessHandleTrayChange,
     .domainPMWakeup = qemuProcessHandlePMWakeup,
@@ -6834,10 +6784,8 @@ qemuProcessPrepareHostStorage(virQEMUDriver *driver,
                               virDomainObj *vm,
                               unsigned int flags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
     size_t i;
     bool cold_boot = flags & VIR_QEMU_PROCESS_START_COLD;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);

     for (i = vm->def->ndisks; i > 0; i--) {
         size_t idx = i - 1;
@@ -6847,7 +6795,7 @@ qemuProcessPrepareHostStorage(virQEMUDriver *driver,
             continue;

         /* backing chain needs to be redetected if we aren't using blockdev */
-        if (!blockdev || qemuDiskBusIsSD(disk->bus))
+        if (qemuDiskBusIsSD(disk->bus))
             virStorageSourceBackingStoreClear(disk->src);

         /*
@@ -7294,13 +7242,9 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriver *driver,
                                        virDomainObj *vm,
                                        virDomainAsyncJob asyncJob)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
     size_t i;
     int ret = -1;

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return 0;
-
     VIR_DEBUG("Setting up disk throttling for -blockdev via block_set_io_throttle");

     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
@@ -7462,11 +7406,6 @@ static int
 qemuProcessSetupDisksTransient(virDomainObj *vm,
                                virDomainAsyncJob asyncJob)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (!(virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)))
-        return 0;
-
     if (qemuProcessSetupDisksTransientSnapshot(vm, asyncJob) < 0)
         return -1;

@@ -7886,8 +7825,6 @@ qemuProcessRefreshState(virQEMUDriver *driver,
                         virDomainObj *vm,
                         virDomainAsyncJob asyncJob)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-
     VIR_DEBUG("Fetching list of active devices");
     if (qemuDomainUpdateDeviceList(driver, vm, asyncJob) < 0)
         return -1;
@@ -7903,9 +7840,6 @@ qemuProcessRefreshState(virQEMUDriver *driver,
     VIR_DEBUG("Updating disk data");
     if (qemuProcessRefreshDisks(driver, vm, asyncJob) < 0)
         return -1;
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        qemuBlockNodeNamesDetect(driver, vm, asyncJob) < 0)
-        return -1;

     return 0;
 }
@@ -8750,101 +8684,6 @@ qemuProcessRefreshCPU(virQEMUDriver *driver,
 }


-static int
-qemuProcessRefreshLegacyBlockjob(void *payload,
-                                 const char *name,
-                                 void *opaque)
-{
-    const char *jobname = name;
-    virDomainObj *vm = opaque;
-    qemuMonitorBlockJobInfo *info = payload;
-    virDomainDiskDef *disk;
-    qemuBlockJobData *job;
-    qemuBlockJobType jobtype = info->type;
-    qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, jobname, jobname))) {
-        VIR_DEBUG("could not find disk for block job '%s'", jobname);
-        return 0;
-    }
-
-    if (jobtype == QEMU_BLOCKJOB_TYPE_COMMIT &&
-        disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT)
-        jobtype = disk->mirrorJob;
-
-    if (!(job = qemuBlockJobDiskNew(vm, disk, jobtype, jobname)))
-        return -1;
-
-    if (disk->mirror) {
-        if ((!info->ready_present && info->end == info->cur) ||
-            info->ready) {
-            disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY;
-            job->state = VIR_DOMAIN_BLOCK_JOB_READY;
-        }
-
-        /* Pre-blockdev block copy labelled the chain of the mirrored device
-         * just before pivoting. At that point it was no longer known whether
-         * it's even necessary (e.g. disk is being reused). This code fixes
-         * the labelling in case the job was started in a libvirt version
-         * which did not label the chain when the block copy is being started.
-         * Note that we can't do much on failure. */
-        if (disk->mirrorJob == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY) {
-            if (qemuDomainDetermineDiskChain(priv->driver, vm, disk,
-                                             disk->mirror, true) < 0)
-                goto cleanup;
-
-            if (disk->mirror->format &&
-                disk->mirror->format != VIR_STORAGE_FILE_RAW &&
-                (qemuDomainNamespaceSetupDisk(vm, disk->mirror, NULL) < 0 ||
-                 qemuSetupImageChainCgroup(vm, disk->mirror) < 0 ||
-                 qemuSecuritySetImageLabel(priv->driver, vm, disk->mirror,
-                                           true, true) < 0))
-                goto cleanup;
-        }
-    }
-
-    qemuBlockJobStarted(job, vm);
-
- cleanup:
-    qemuBlockJobStartupFinalize(vm, job);
-
-    return 0;
-}
-
-
-static int
-qemuProcessRefreshLegacyBlockjobs(virQEMUDriver *driver,
-                                  virDomainObj *vm)
-{
-    g_autoptr(GHashTable) blockJobs = NULL;
-
-    qemuDomainObjEnterMonitor(driver, vm);
-    blockJobs = qemuMonitorGetAllBlockJobInfo(qemuDomainGetMonitor(vm), true);
-    qemuDomainObjExitMonitor(vm);
-
-    if (!blockJobs)
-        return -1;
-
-    if (virHashForEach(blockJobs, qemuProcessRefreshLegacyBlockjob, vm) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-static int
-qemuProcessRefreshBlockjobs(virQEMUDriver *driver,
-                            virDomainObj *vm)
-{
-    qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return qemuBlockJobRefreshJobs(driver, vm);
-
-    return qemuProcessRefreshLegacyBlockjobs(driver, vm);
-}
-
-
 struct qemuProcessReconnectData {
     virQEMUDriver *driver;
     virDomainObj *obj;
@@ -8952,19 +8791,6 @@ qemuProcessReconnect(void *opaque)

         if (virDomainDiskTranslateSourcePool(disk) < 0)
             goto error;
-
-        /* backing chains need to be refreshed only if they could change */
-        if (priv->reconnectBlockjobs != VIR_TRISTATE_BOOL_NO &&
-            !virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-            /* This should be the only place that calls
-             * qemuDomainDetermineDiskChain with @report_broken == false
-             * to guarantee best-effort domain reconnect */
-            virStorageSourceBackingStoreClear(disk->src);
-            if (qemuDomainDetermineDiskChain(driver, obj, disk, NULL, false) < 0)
-                goto error;
-        } else {
-            VIR_DEBUG("skipping backing chain detection for '%s'", disk->dst);
-        }
     }

     for (i = 0; i < obj->def->ngraphics; i++) {
@@ -9054,10 +8880,6 @@ qemuProcessReconnect(void *opaque)
             QEMU_DOMAIN_DISK_PRIVATE(disk)->transientOverlayCreated = true;
     }

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        qemuBlockNodeNamesDetect(driver, obj, VIR_ASYNC_JOB_NONE) < 0)
-        goto error;
-
     if (qemuRefreshVirtioChannelState(driver, obj, VIR_ASYNC_JOB_NONE) < 0)
         goto error;

@@ -9070,7 +8892,7 @@ qemuProcessReconnect(void *opaque)
     if (qemuProcessRecoverJob(driver, obj, &oldjob, &stopFlags) < 0)
         goto error;

-    if (qemuProcessRefreshBlockjobs(driver, obj) < 0)
+    if (qemuBlockJobRefreshJobs(driver, obj) < 0)
         goto error;

     if (qemuProcessUpdateDevices(driver, obj) < 0)
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:10 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:10 +0200
Subject: [PATCH 32/80] qemu: Remove legacy block job event processing handler
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f9d01d71634f6e0f358cabc177364471eff8a635.1658843187.git.pkrempa@redhat.com>

Previous patches removed the job submission for the handler so now even
the handler itself can be removed.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c |  1 -
 src/qemu/qemu_domain.h |  1 -
 src/qemu/qemu_driver.c | 45 ------------------------------------------
 3 files changed, 47 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d45c5d30a9..7403b2584b 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11126,7 +11126,6 @@ qemuProcessEventFree(struct qemuProcessEvent *event)
     case QEMU_PROCESS_EVENT_DEVICE_DELETED:
     case QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED:
     case QEMU_PROCESS_EVENT_SERIAL_CHANGED:
-    case QEMU_PROCESS_EVENT_BLOCK_JOB:
     case QEMU_PROCESS_EVENT_MONITOR_EOF:
     case QEMU_PROCESS_EVENT_GUEST_CRASHLOADED:
         g_free(event->data);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 4680df1098..66188ed003 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -418,7 +418,6 @@ typedef enum {
     QEMU_PROCESS_EVENT_DEVICE_DELETED,
     QEMU_PROCESS_EVENT_NIC_RX_FILTER_CHANGED,
     QEMU_PROCESS_EVENT_SERIAL_CHANGED,
-    QEMU_PROCESS_EVENT_BLOCK_JOB,
     QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE,
     QEMU_PROCESS_EVENT_MONITOR_EOF,
     QEMU_PROCESS_EVENT_PR_DISCONNECT,
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d5a3181c0d..1e7f17b750 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4031,45 +4031,6 @@ processSerialChangedEvent(virQEMUDriver *driver,
 }


-static void
-processBlockJobEvent(virQEMUDriver *driver,
-                     virDomainObj *vm,
-                     const char *diskAlias,
-                     int type,
-                     int status)
-{
-    virDomainDiskDef *disk;
-    g_autoptr(qemuBlockJobData) job = NULL;
-
-    if (qemuDomainObjBeginJob(driver, vm, VIR_JOB_MODIFY) < 0)
-        return;
-
-    if (!virDomainObjIsActive(vm)) {
-        VIR_DEBUG("Domain is not running");
-        goto endjob;
-    }
-
-    if (!(disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL))) {
-        VIR_DEBUG("disk %s not found", diskAlias);
-        goto endjob;
-    }
-
-    if (!(job = qemuBlockJobDiskGetJob(disk))) {
-        VIR_DEBUG("creating new block job object for '%s'", diskAlias);
-        if (!(job = qemuBlockJobDiskNew(vm, disk, type, diskAlias)))
-            goto endjob;
-        job->state = QEMU_BLOCKJOB_STATE_RUNNING;
-    }
-
-    job->newstate = status;
-
-    qemuBlockJobUpdate(vm, job, VIR_ASYNC_JOB_NONE);
-
- endjob:
-    qemuDomainObjEndJob(vm);
-}
-
-
 static void
 processJobStatusChangeEvent(virQEMUDriver *driver,
                             virDomainObj *vm,
@@ -4279,12 +4240,6 @@ static void qemuProcessEventHandler(void *data, void *opaque)
         processSerialChangedEvent(driver, vm, processEvent->data,
                                   processEvent->action);
         break;
-    case QEMU_PROCESS_EVENT_BLOCK_JOB:
-        processBlockJobEvent(driver, vm,
-                             processEvent->data,
-                             processEvent->action,
-                             processEvent->status);
-        break;
     case QEMU_PROCESS_EVENT_JOB_STATUS_CHANGE:
         processJobStatusChangeEvent(driver, vm, processEvent->data);
         break;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:06 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:06 +0200
Subject: [PATCH 28/80] qemu: migration_cookie: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <5cb07666d8a9fdb86d7db8e6e9c0bfd476c19368.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_migration_cookie.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index 0738ad430f..88c147e9fa 100644
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -479,7 +479,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig,
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(GHashTable) stats = virHashNew(g_free);
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     size_t i;
     int rc;

@@ -499,11 +498,11 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig,

     if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0)
         return -1;
-    if (blockdev)
-        rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats);
-    else
-        rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats);
+
+    rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats);
+
     qemuDomainObjExitMonitor(vm);
+
     if (rc < 0)
         return -1;

@@ -511,14 +510,8 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig,
         virDomainDiskDef *disk = vm->def->disks[i];
         qemuBlockStats *entry;

-        if (blockdev) {
-            if (!(entry = virHashLookup(stats, disk->src->nodeformat)))
-                continue;
-        } else {
-            if (!disk->info.alias ||
-                !(entry = virHashLookup(stats, disk->info.alias)))
-                continue;
-        }
+        if (!(entry = virHashLookup(stats, disk->src->nodeformat)))
+            continue;

         mig->nbd->disks[mig->nbd->ndisks].target = g_strdup(disk->dst);
         mig->nbd->disks[mig->nbd->ndisks].capacity = entry->capacity;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:07 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:07 +0200
Subject: [PATCH 29/80] qemu: validate: Remove impossible validation checks
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <7eab47f6d7293c21e6d4c918f1ff2552bdc265f6.1658843187.git.pkrempa@redhat.com>

All supported qemu versions now work with blockdev.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_validate.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index b949e1aa42..4ce920152f 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -609,13 +609,6 @@ qemuValidateDomainDefNvram(const virDomainDef *def,
     if (!src)
         return 0;

-    if (def->os.loader->newStyleNVRAM &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("modern nvram specification is not supported by this qemu"));
-        return -1;
-    }
-
     switch (src->type) {
     case VIR_STORAGE_TYPE_FILE:
     case VIR_STORAGE_TYPE_BLOCK:
@@ -3182,13 +3175,6 @@ qemuValidateDomainDeviceDefDiskTransient(const virDomainDiskDef *disk,
         return -1;
     }

-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                       _("transient disk not supported by this QEMU binary (%s)"),
-                       disk->dst);
-        return -1;
-    }
-
     if (disk->transientShareBacking == VIR_TRISTATE_BOOL_YES) {
         if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SET_ACTION) &&
             !qemuProcessRebootAllowed(def)) {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:15 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:15 +0200
Subject: [PATCH 37/80] qemu: alias: Remove check for QEMU_CAPS_BLOCKDEV
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <c29699cae0c1b15bda1a5c0857eded0f6a5e9413.1658843187.git.pkrempa@redhat.com>

The only instance in this file can be simplified to avoid checking the
capability.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_alias.c   | 10 ++++------
 src/qemu/qemu_alias.h   |  5 ++---
 src/qemu/qemu_hotplug.c |  2 +-
 src/qemu/qemu_process.c |  2 +-
 tests/qemuhotplugtest.c |  2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 7b91fe3141..835401dc07 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -192,8 +192,7 @@ qemuAssignDeviceControllerAlias(virDomainDef *domainDef,

 int
 qemuAssignDeviceDiskAlias(virDomainDef *def,
-                          virDomainDiskDef *disk,
-                          virQEMUCaps *qemuCaps)
+                          virDomainDiskDef *disk)
 {
     qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
     const char *prefix = virDomainDiskBusTypeToString(disk->bus);
@@ -231,8 +230,7 @@ qemuAssignDeviceDiskAlias(virDomainDef *def,
      * on the alias in qemu. While certain disk types use just the alias, some
      * need the full path into /machine/peripheral as a historical artifact.
      */
-    if (!diskPriv->qomName &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
+    if (!diskPriv->qomName) {
         switch ((virDomainDiskBus) disk->bus) {
         case VIR_DOMAIN_DISK_BUS_FDC:
         case VIR_DOMAIN_DISK_BUS_IDE:
@@ -606,12 +604,12 @@ qemuAssignDeviceIOMMUAlias(virDomainIOMMUDef *iommu)


 int
-qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps)
+qemuAssignDeviceAliases(virDomainDef *def)
 {
     size_t i;

     for (i = 0; i < def->ndisks; i++) {
-        if (qemuAssignDeviceDiskAlias(def, def->disks[i], qemuCaps) < 0)
+        if (qemuAssignDeviceDiskAlias(def, def->disks[i]) < 0)
             return -1;
     }
     for (i = 0; i < def->nnets; i++) {
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 1a583b8207..6433ae4cec 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -33,8 +33,7 @@ void qemuAssignDeviceControllerAlias(virDomainDef *domainDef,
                                      virDomainControllerDef *controller);

 int qemuAssignDeviceDiskAlias(virDomainDef *def,
-                              virDomainDiskDef *disk,
-                              virQEMUCaps *qemuCaps);
+                              virDomainDiskDef *disk);

 void qemuAssignDeviceHostdevAlias(virDomainDef *def,
                                   char **alias,
@@ -71,7 +70,7 @@ void qemuAssignDeviceInputAlias(virDomainDef *def,

 void qemuAssignDeviceVsockAlias(virDomainVsockDef *vsock);

-int qemuAssignDeviceAliases(virDomainDef *def, virQEMUCaps *qemuCaps);
+int qemuAssignDeviceAliases(virDomainDef *def);

 int qemuDomainDeviceAliasIndex(const virDomainDeviceInfo *info,
                                const char *prefix);
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5eb370c3df..28e4284e62 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1081,7 +1081,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,

     releaseSeclabel = true;

-    if (qemuAssignDeviceDiskAlias(vm->def, disk, priv->qemuCaps) < 0)
+    if (qemuAssignDeviceDiskAlias(vm->def, disk) < 0)
         goto cleanup;

     if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6083ee10d8..f13664c7f2 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6629,7 +6629,7 @@ qemuProcessPrepareDomain(virQEMUDriver *driver,
         return -1;
     }

-    if (qemuAssignDeviceAliases(vm->def, priv->qemuCaps) < 0)
+    if (qemuAssignDeviceAliases(vm->def) < 0)
         return -1;

     qemuProcessPrepareDeviceBootorder(vm->def);
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 3c9dac241a..c938c8dc4c 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -107,7 +107,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,
         return -1;
     }

-    if (qemuAssignDeviceAliases((*vm)->def, priv->qemuCaps) < 0)
+    if (qemuAssignDeviceAliases((*vm)->def) < 0)
         return -1;

     (*vm)->def->id = QEMU_HOTPLUG_TEST_DOMAIN_ID;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:13 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:13 +0200
Subject: [PATCH 35/80] qemu: block: Remove 'qemuBlockNodeNamesDetect' and
 related infrastructure
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <bbf0b0bcfc4706e74ae73e9b8999905d214eb2f4.1658843187.git.pkrempa@redhat.com>

With blockdev we are generating the nodenames ourselves so all of this
infrastructrure became obsolete. Remove it.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c                         | 274 -------
 src/qemu/qemu_block.h                         |   9 -
 ...monitorjson-nodename-basic-blockstats.json | 166 -----
 ...onitorjson-nodename-basic-named-nodes.json | 268 -------
 .../qemumonitorjson-nodename-basic.result     |  16 -
 ...itorjson-nodename-blockjob-blockstats.json | 301 --------
 ...torjson-nodename-blockjob-named-nodes.json | 682 ------------------
 .../qemumonitorjson-nodename-blockjob.result  |  26 -
 ...monitorjson-nodename-empty-blockstats.json |   2 -
 ...onitorjson-nodename-empty-named-nodes.json |   2 -
 .../qemumonitorjson-nodename-empty.result     |   0
 ...nitorjson-nodename-gluster-blockstats.json | 111 ---
 ...itorjson-nodename-gluster-named-nodes.json | 135 ----
 .../qemumonitorjson-nodename-gluster.result   |  11 -
 ...monitorjson-nodename-iscsi-blockstats.json | 113 ---
 ...onitorjson-nodename-iscsi-named-nodes.json | 114 ---
 .../qemumonitorjson-nodename-iscsi.result     |  13 -
 ...umonitorjson-nodename-luks-blockstats.json |  58 --
 ...monitorjson-nodename-luks-named-nodes.json | 109 ---
 .../qemumonitorjson-nodename-luks.result      |   6 -
 ...mumonitorjson-nodename-old-blockstats.json | 160 ----
 ...umonitorjson-nodename-old-named-nodes.json |   2 -
 .../qemumonitorjson-nodename-old.result       |   0
 ...itorjson-nodename-relative-blockstats.json | 329 ---------
 ...torjson-nodename-relative-named-nodes.json | 554 --------------
 .../qemumonitorjson-nodename-relative.result  |  33 -
 ...json-nodename-same-backing-blockstats.json | 221 ------
 ...son-nodename-same-backing-named-nodes.json | 316 --------
 ...mumonitorjson-nodename-same-backing.result |  23 -
 tests/qemumonitorjsontest.c                   |  92 ---
 30 files changed, 4146 deletions(-)
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
 delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 141bf1b3e7..ea0b783bbb 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -70,280 +70,6 @@ qemuBlockNamedNodesArrayToHash(size_t pos G_GNUC_UNUSED,
 }


-static void
-qemuBlockNodeNameBackingChainDataFree(qemuBlockNodeNameBackingChainData *data)
-{
-    if (!data)
-        return;
-
-    g_free(data->nodeformat);
-    g_free(data->nodestorage);
-
-    g_free(data->qemufilename);
-
-    g_free(data->drvformat);
-    g_free(data->drvstorage);
-
-    qemuBlockNodeNameBackingChainDataFree(data->backing);
-
-    g_free(data);
-}
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(qemuBlockNodeNameBackingChainData,
-                        qemuBlockNodeNameBackingChainDataFree);
-
-
-static void
-qemuBlockNodeNameBackingChainDataHashEntryFree(void *opaque)
-{
-    qemuBlockNodeNameBackingChainDataFree(opaque);
-}
-
-
-/* list of driver names of layers that qemu automatically adds into the
- * backing chain */
-static const char *qemuBlockDriversBlockjob[] = {
-    "mirror_top", "commit_top", NULL };
-
-static bool
-qemuBlockDriverMatch(const char *drvname,
-                     const char **drivers)
-{
-    while (*drivers) {
-        if (STREQ(drvname, *drivers))
-            return true;
-
-        drivers++;
-    }
-
-    return false;
-}
-
-
-struct qemuBlockNodeNameGetBackingChainData {
-    GHashTable *nodenamestable;
-    GHashTable *disks;
-};
-
-
-static int
-qemuBlockNodeNameGetBackingChainBacking(virJSONValue *next,
-                                        GHashTable *nodenamestable,
-                                        qemuBlockNodeNameBackingChainData **nodenamedata)
-{
-    g_autoptr(qemuBlockNodeNameBackingChainData) data = NULL;
-    qemuBlockNodeNameBackingChainData *backingdata = NULL;
-    virJSONValue *backing = virJSONValueObjectGetObject(next, "backing");
-    virJSONValue *parent = virJSONValueObjectGetObject(next, "parent");
-    virJSONValue *parentnodedata;
-    virJSONValue *nodedata;
-    const char *nodename = virJSONValueObjectGetString(next, "node-name");
-    const char *drvname = NULL;
-    const char *drvparent = NULL;
-    const char *parentnodename = NULL;
-    const char *filename = NULL;
-
-    if (!nodename)
-        return 0;
-
-    if ((nodedata = virHashLookup(nodenamestable, nodename)) &&
-        (drvname = virJSONValueObjectGetString(nodedata, "drv"))) {
-
-        /* qemu 2.9 reports layers in the backing chain which don't correspond
-         * to files. skip them */
-        if (qemuBlockDriverMatch(drvname, qemuBlockDriversBlockjob)) {
-            if (backing) {
-                return qemuBlockNodeNameGetBackingChainBacking(backing,
-                                                               nodenamestable,
-                                                               nodenamedata);
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    if (parent &&
-        (parentnodename = virJSONValueObjectGetString(parent, "node-name"))) {
-        if ((parentnodedata = virHashLookup(nodenamestable, parentnodename))) {
-            filename = virJSONValueObjectGetString(parentnodedata, "file");
-            drvparent = virJSONValueObjectGetString(parentnodedata, "drv");
-        }
-    }
-
-    data = g_new0(qemuBlockNodeNameBackingChainData, 1);
-
-    data->nodeformat = g_strdup(nodename);
-    data->nodestorage = g_strdup(parentnodename);
-    data->qemufilename = g_strdup(filename);
-    data->drvformat = g_strdup(drvname);
-    data->drvstorage = g_strdup(drvparent);
-
-    if (backing &&
-        qemuBlockNodeNameGetBackingChainBacking(backing, nodenamestable,
-                                                &backingdata) < 0)
-        return -1;
-
-    data->backing = g_steal_pointer(&backingdata);
-    *nodenamedata = g_steal_pointer(&data);
-
-    return 0;
-}
-
-
-static int
-qemuBlockNodeNameGetBackingChainDisk(size_t pos G_GNUC_UNUSED,
-                                     virJSONValue *item,
-                                     void *opaque)
-{
-    struct qemuBlockNodeNameGetBackingChainData *data = opaque;
-    const char *device = virJSONValueObjectGetString(item, "device");
-    g_autoptr(qemuBlockNodeNameBackingChainData) devicedata = NULL;
-
-    if (qemuBlockNodeNameGetBackingChainBacking(item, data->nodenamestable,
-                                                &devicedata) < 0)
-        return -1;
-
-    if (devicedata &&
-        virHashAddEntry(data->disks, device, devicedata) < 0)
-        return -1;
-
-    devicedata = NULL;
-    return 1; /* we don't really want to steal @item */
-}
-
-
-/**
- * qemuBlockNodeNameGetBackingChain:
- * @namednodes: JSON array of data returned from 'query-named-block-nodes'
- * @blockstats: JSON array of data returned from 'query-blockstats'
- *
- * Tries to reconstruct the backing chain from @json to allow detection of
- * node names that were auto-assigned by qemu. This is a best-effort operation
- * and may not be successful. The returned hash table contains the entries as
- * qemuBlockNodeNameBackingChainData *accessible by the node name. The fields
- * then can be used to recover the full backing chain.
- *
- * Returns a hash table on success and NULL on failure.
- */
-GHashTable *
-qemuBlockNodeNameGetBackingChain(virJSONValue *namednodes,
-                                 virJSONValue *blockstats)
-{
-    g_autoptr(GHashTable) namednodestable = virHashNew(virJSONValueHashFree);
-    g_autoptr(GHashTable) disks = virHashNew(qemuBlockNodeNameBackingChainDataHashEntryFree);
-    struct qemuBlockNodeNameGetBackingChainData data = { .nodenamestable = namednodestable,
-                                                         .disks = disks };
-
-    if (virJSONValueArrayForeachSteal(namednodes,
-                                      qemuBlockNamedNodesArrayToHash,
-                                      namednodestable) < 0)
-        return NULL;
-
-    if (virJSONValueArrayForeachSteal(blockstats,
-                                      qemuBlockNodeNameGetBackingChainDisk,
-                                      &data) < 0)
-        return NULL;
-
-    return g_steal_pointer(&disks);
-}
-
-
-static void
-qemuBlockDiskClearDetectedNodes(virDomainDiskDef *disk)
-{
-    virStorageSource *next = disk->src;
-
-    while (virStorageSourceIsBacking(next)) {
-        VIR_FREE(next->nodeformat);
-        VIR_FREE(next->nodestorage);
-
-        next = next->backingStore;
-    }
-}
-
-
-static int
-qemuBlockDiskDetectNodes(virDomainDiskDef *disk,
-                         GHashTable *disktable)
-{
-    qemuBlockNodeNameBackingChainData *entry = NULL;
-    virStorageSource *src = disk->src;
-    g_autofree char *alias = NULL;
-
-    /* don't attempt the detection if the top level already has node names */
-    if (src->nodeformat || src->nodestorage)
-        return 0;
-
-    if (!(alias = qemuAliasDiskDriveFromDisk(disk)))
-        return -1;
-
-    if (!(entry = virHashLookup(disktable, alias)))
-        return 0;
-
-    while (virStorageSourceIsBacking(src) && entry) {
-        if (src->nodeformat || src->nodestorage) {
-            if (STRNEQ_NULLABLE(src->nodeformat, entry->nodeformat) ||
-                STRNEQ_NULLABLE(src->nodestorage, entry->nodestorage))
-                goto error;
-
-            break;
-        } else {
-            src->nodeformat = g_strdup(entry->nodeformat);
-            src->nodestorage = g_strdup(entry->nodestorage);
-        }
-
-        entry = entry->backing;
-        src = src->backingStore;
-    }
-
-    return 0;
-
- error:
-    qemuBlockDiskClearDetectedNodes(disk);
-    return -1;
-}
-
-
-int
-qemuBlockNodeNamesDetect(virQEMUDriver *driver,
-                         virDomainObj *vm,
-                         virDomainAsyncJob asyncJob)
-{
-    qemuDomainObjPrivate *priv = vm->privateData;
-    g_autoptr(GHashTable) disktable = NULL;
-    g_autoptr(virJSONValue) data = NULL;
-    g_autoptr(virJSONValue) blockstats = NULL;
-    virDomainDiskDef *disk;
-    size_t i;
-
-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_NAMED_BLOCK_NODES))
-        return 0;
-
-    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
-        return -1;
-
-    data = qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm));
-    blockstats = qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm));
-
-    qemuDomainObjExitMonitor(vm);
-
-    if (!data || !blockstats)
-        return -1;
-
-    if (!(disktable = qemuBlockNodeNameGetBackingChain(data, blockstats)))
-        return -1;
-
-    for (i = 0; i < vm->def->ndisks; i++) {
-        disk = vm->def->disks[i];
-
-        if (qemuBlockDiskDetectNodes(disk, disktable) < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
-
 /**
  * qemuBlockGetNodeData:
  * @data: JSON object returned from query-named-block-nodes
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index b22a541797..134ce41dd5 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -39,15 +39,6 @@ struct qemuBlockNodeNameBackingChainData {
     char *drvstorage;
 };

-GHashTable *
-qemuBlockNodeNameGetBackingChain(virJSONValue *namednodesdata,
-                                 virJSONValue *blockstats);
-
-int
-qemuBlockNodeNamesDetect(virQEMUDriver *driver,
-                         virDomainObj *vm,
-                         virDomainAsyncJob asyncJob);
-
 GHashTable *
 qemuBlockGetNodeData(virJSONValue *data);

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
deleted file mode 100644
index c3752b4cfe..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json
+++ /dev/null
@@ -1,166 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 32899072,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block033"
-      },
-      "stats": {
-        "flush_total_time_ns": 452246313,
-        "wr_highest_offset": 8072282112,
-        "wr_total_time_ns": 4803102521,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 8,
-        "wr_bytes": 6517248,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 11065169148,
-        "flush_operations": 10,
-        "wr_operations": 129,
-        "rd_merged": 77,
-        "rd_bytes": 76399104,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 22663656304,
-        "rd_operations": 4038,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block220"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block481"
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block558"
-        },
-        "node-name": "#block306"
-      },
-      "node-name": "#block187"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
deleted file mode 100644
index ce8fdae70f..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 9665384448,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": true,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block558",
-      "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": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 9665380352,
-        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "format": "file",
-        "actual-size": 9665384448,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block481",
-      "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": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 9663676416,
-          "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 9665384448,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": true,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block306",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block220",
-      "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": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 9663676416,
-            "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 9665384448,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": true,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 9663676416,
-          "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 33165312,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block187",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 33226752,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
-        "format": "file",
-        "actual-size": 33165312,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block033",
-      "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": "/var/lib/libvirt/images/rhel7.3.1483545313",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
deleted file mode 100644
index ad8b9b46ed..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result
+++ /dev/null
@@ -1,16 +0,0 @@
-drive-virtio-disk0
-filename    : '/var/lib/libvirt/images/rhel7.3.1483545313'
-format node : '#block187'
-format drv  : 'qcow2'
-storage node: '#block033'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/rhel7.3.1483536402'
-  format node : '#block306'
-  format drv  : 'qcow2'
-  storage node: '#block220'
-  storage drv : 'file'
-    filename    : '/var/lib/libvirt/images/rhel7.3.qcow2'
-    format node : '#block558'
-    format drv  : 'qcow2'
-    storage node: '#block481'
-    storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
deleted file mode 100644
index 51cd664c20..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json
+++ /dev/null
@@ -1,301 +0,0 @@
-[
-    {
-      "device": "drive-ide0-0-0",
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 99763,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 1142142388760097,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block042"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block259"
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "backing": {
-            "parent": {
-              "stats": {
-                "flush_total_time_ns": 0,
-                "wr_highest_offset": 0,
-                "wr_total_time_ns": 0,
-                "failed_wr_operations": 0,
-                "failed_rd_operations": 0,
-                "wr_merged": 0,
-                "wr_bytes": 0,
-                "timed_stats": [
-
-                ],
-                "failed_flush_operations": 0,
-                "account_invalid": false,
-                "rd_total_time_ns": 0,
-                "flush_operations": 0,
-                "wr_operations": 0,
-                "rd_merged": 0,
-                "rd_bytes": 0,
-                "invalid_flush_operations": 0,
-                "account_failed": false,
-                "rd_operations": 0,
-                "invalid_wr_operations": 0,
-                "invalid_rd_operations": 0
-              },
-              "node-name": "#block449"
-            },
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "backing": {
-              "parent": {
-                "stats": {
-                  "flush_total_time_ns": 0,
-                  "wr_highest_offset": 0,
-                  "wr_total_time_ns": 0,
-                  "failed_wr_operations": 0,
-                  "failed_rd_operations": 0,
-                  "wr_merged": 0,
-                  "wr_bytes": 0,
-                  "timed_stats": [
-
-                  ],
-                  "failed_flush_operations": 0,
-                  "account_invalid": false,
-                  "rd_total_time_ns": 0,
-                  "flush_operations": 0,
-                  "wr_operations": 0,
-                  "rd_merged": 0,
-                  "rd_bytes": 0,
-                  "invalid_flush_operations": 0,
-                  "account_failed": false,
-                  "rd_operations": 0,
-                  "invalid_wr_operations": 0,
-                  "invalid_rd_operations": 0
-                },
-                "node-name": "#block618"
-              },
-              "stats": {
-                "flush_total_time_ns": 0,
-                "wr_highest_offset": 0,
-                "wr_total_time_ns": 0,
-                "failed_wr_operations": 0,
-                "failed_rd_operations": 0,
-                "wr_merged": 0,
-                "wr_bytes": 0,
-                "timed_stats": [
-
-                ],
-                "failed_flush_operations": 0,
-                "account_invalid": false,
-                "rd_total_time_ns": 0,
-                "flush_operations": 0,
-                "wr_operations": 0,
-                "rd_merged": 0,
-                "rd_bytes": 0,
-                "invalid_flush_operations": 0,
-                "account_failed": false,
-                "rd_operations": 0,
-                "invalid_wr_operations": 0,
-                "invalid_rd_operations": 0
-              },
-              "backing": {
-                "parent": {
-                  "stats": {
-                    "flush_total_time_ns": 0,
-                    "wr_highest_offset": 0,
-                    "wr_total_time_ns": 0,
-                    "failed_wr_operations": 0,
-                    "failed_rd_operations": 0,
-                    "wr_merged": 0,
-                    "wr_bytes": 0,
-                    "timed_stats": [
-
-                    ],
-                    "failed_flush_operations": 0,
-                    "account_invalid": false,
-                    "rd_total_time_ns": 0,
-                    "flush_operations": 0,
-                    "wr_operations": 0,
-                    "rd_merged": 0,
-                    "rd_bytes": 0,
-                    "invalid_flush_operations": 0,
-                    "account_failed": false,
-                    "rd_operations": 0,
-                    "invalid_wr_operations": 0,
-                    "invalid_rd_operations": 0
-                  },
-                  "node-name": "#block846"
-                },
-                "stats": {
-                  "flush_total_time_ns": 0,
-                  "wr_highest_offset": 0,
-                  "wr_total_time_ns": 0,
-                  "failed_wr_operations": 0,
-                  "failed_rd_operations": 0,
-                  "wr_merged": 0,
-                  "wr_bytes": 0,
-                  "timed_stats": [
-
-                  ],
-                  "failed_flush_operations": 0,
-                  "account_invalid": false,
-                  "rd_total_time_ns": 0,
-                  "flush_operations": 0,
-                  "wr_operations": 0,
-                  "rd_merged": 0,
-                  "rd_bytes": 0,
-                  "invalid_flush_operations": 0,
-                  "account_failed": false,
-                  "rd_operations": 0,
-                  "invalid_wr_operations": 0,
-                  "invalid_rd_operations": 0
-                },
-                "node-name": "#block901"
-              },
-              "node-name": "#block717"
-            },
-            "node-name": "#block551"
-          },
-          "node-name": "#block312"
-        },
-        "node-name": "#block179"
-      },
-      "node-name": "#block3343"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
deleted file mode 100644
index 3cebb23a94..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json
+++ /dev/null
@@ -1,682 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "backing-image": {
-                "backing-image": {
-                  "virtual-size": 10485760,
-                  "filename": "/var/lib/libvirt/images/a",
-                  "format": "raw",
-                  "actual-size": 0,
-                  "dirty-flag": false
-                },
-                "backing-filename-format": "raw",
-                "virtual-size": 10485760,
-                "filename": "/var/lib/libvirt/images/c",
-                "cluster-size": 65536,
-                "format": "qcow2",
-                "actual-size": 200704,
-                "format-specific": {
-                  "type": "qcow2",
-                  "data": {
-                    "compat": "1.1",
-                    "lazy-refcounts": false,
-                    "refcount-bits": 16,
-                    "corrupt": false
-                  }
-                },
-                "full-backing-filename": "/var/lib/libvirt/images/a",
-                "backing-filename": "/var/lib/libvirt/images/a",
-                "dirty-flag": false
-              },
-              "backing-filename-format": "qcow2",
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/d",
-              "cluster-size": 65536,
-              "format": "qcow2",
-              "actual-size": 200704,
-              "format-specific": {
-                "type": "qcow2",
-                "data": {
-                  "compat": "1.1",
-                  "lazy-refcounts": false,
-                  "refcount-bits": 16,
-                  "corrupt": false
-                }
-              },
-              "full-backing-filename": "/var/lib/libvirt/images/c",
-              "backing-filename": "/var/lib/libvirt/images/c",
-              "dirty-flag": false
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/d.1499152668",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/d",
-            "backing-filename": "/var/lib/libvirt/images/d",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/d.1499152698",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/d.1499152668",
-          "backing-filename": "/var/lib/libvirt/images/d.1499152668",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d.1499152698",
-        "format": "mirror_top",
-        "full-backing-filename": "/var/lib/libvirt/images/d.1499152698",
-        "backing-filename": "/var/lib/libvirt/images/d.1499152698"
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block3343",
-      "backing_file_depth": 5,
-      "drv": "mirror_top",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/d.1499152698",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152698",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/tmp/kkt",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 266240,
-        "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": "#block3243",
-      "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/kkt",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 327680,
-        "filename": "/tmp/kkt",
-        "format": "file",
-        "actual-size": 266240,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block3144",
-      "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/kkt",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a",
-        "format": "raw",
-        "actual-size": 0,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block901",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a",
-        "format": "file",
-        "actual-size": 0,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block846",
-      "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": "/var/lib/libvirt/images/a",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/a",
-          "format": "raw",
-          "actual-size": 0,
-          "dirty-flag": false
-        },
-        "backing-filename-format": "raw",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/c",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/a",
-        "backing-filename": "/var/lib/libvirt/images/a",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block717",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/a",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/c",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/c",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block618",
-      "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": "/var/lib/libvirt/images/c",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/a",
-            "format": "raw",
-            "actual-size": 0,
-            "dirty-flag": false
-          },
-          "backing-filename-format": "raw",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/c",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/a",
-          "backing-filename": "/var/lib/libvirt/images/a",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/c",
-        "backing-filename": "/var/lib/libvirt/images/c",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block551",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/c",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/d",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block449",
-      "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": "/var/lib/libvirt/images/d",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/a",
-              "format": "raw",
-              "actual-size": 0,
-              "dirty-flag": false
-            },
-            "backing-filename-format": "raw",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/c",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/a",
-            "backing-filename": "/var/lib/libvirt/images/a",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/d",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/c",
-          "backing-filename": "/var/lib/libvirt/images/c",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d.1499152668",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/d",
-        "backing-filename": "/var/lib/libvirt/images/d",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block312",
-      "backing_file_depth": 3,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/d",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152668",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/d.1499152668",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block259",
-      "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": "/var/lib/libvirt/images/d.1499152668",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "backing-image": {
-                "virtual-size": 10485760,
-                "filename": "/var/lib/libvirt/images/a",
-                "format": "raw",
-                "actual-size": 0,
-                "dirty-flag": false
-              },
-              "backing-filename-format": "raw",
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/c",
-              "cluster-size": 65536,
-              "format": "qcow2",
-              "actual-size": 200704,
-              "format-specific": {
-                "type": "qcow2",
-                "data": {
-                  "compat": "1.1",
-                  "lazy-refcounts": false,
-                  "refcount-bits": 16,
-                  "corrupt": false
-                }
-              },
-              "full-backing-filename": "/var/lib/libvirt/images/a",
-              "backing-filename": "/var/lib/libvirt/images/a",
-              "dirty-flag": false
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/d",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/c",
-            "backing-filename": "/var/lib/libvirt/images/c",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/d.1499152668",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/d",
-          "backing-filename": "/var/lib/libvirt/images/d",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/d.1499152698",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/d.1499152668",
-        "backing-filename": "/var/lib/libvirt/images/d.1499152668",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block179",
-      "backing_file_depth": 4,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/d.1499152668",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/d.1499152698",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/d.1499152698",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block042",
-      "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": "/var/lib/libvirt/images/d.1499152698",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
deleted file mode 100644
index 4abe6f9347..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result
+++ /dev/null
@@ -1,26 +0,0 @@
-drive-ide0-0-0
-filename    : '/var/lib/libvirt/images/d.1499152698'
-format node : '#block179'
-format drv  : 'qcow2'
-storage node: '#block042'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/d.1499152668'
-  format node : '#block312'
-  format drv  : 'qcow2'
-  storage node: '#block259'
-  storage drv : 'file'
-    filename    : '/var/lib/libvirt/images/d'
-    format node : '#block551'
-    format drv  : 'qcow2'
-    storage node: '#block449'
-    storage drv : 'file'
-      filename    : '/var/lib/libvirt/images/c'
-      format node : '#block717'
-      format drv  : 'qcow2'
-      storage node: '#block618'
-      storage drv : 'file'
-        filename    : '/var/lib/libvirt/images/a'
-        format node : '#block901'
-        format drv  : 'raw'
-        storage node: '#block846'
-        storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
deleted file mode 100644
index 665a6b05bf..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json
+++ /dev/null
@@ -1,111 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block282"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block477"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block596"
-      },
-      "node-name": "#block338"
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
deleted file mode 100644
index e6bd2cfa72..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img0",
-        "format": "raw",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block596",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img0",
-        "format": "gluster",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block477",
-      "backing_file_depth": 0,
-      "drv": "gluster",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 197120,
-          "filename": "gluster://gluster-host/vol0/img0",
-          "format": "raw",
-          "actual-size": 197120
-        },
-        "backing-filename-format": "raw",
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host:24007/vol0/img1",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 197120,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "gluster://gluster-host/vol0/img0",
-        "backing-filename": "gluster://gluster-host/vol0/img0",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block338",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "gluster://gluster-host/vol0/img0",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host:24007/vol0/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host:24007/vol0/img1",
-        "format": "gluster",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block282",
-      "backing_file_depth": 0,
-      "drv": "gluster",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host:24007/vol0/img1",
-      "encryption_key_missing": false
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
deleted file mode 100644
index 6289fdd1ad..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
+++ /dev/null
@@ -1,11 +0,0 @@
-drive-virtio-disk0
-filename    : 'gluster://gluster-host:24007/vol0/img1'
-format node : '#block338'
-format drv  : 'qcow2'
-storage node: '#block282'
-storage drv : 'gluster'
-  filename    : 'gluster://gluster-host/vol0/img0'
-  format node : '#block596'
-  format drv  : 'raw'
-  storage node: '#block477'
-  storage drv : 'gluster'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
deleted file mode 100644
index b13386ecbb..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json
+++ /dev/null
@@ -1,113 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block038"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 995504,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 117550038551,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "node-name": "#block169"
-    },
-    {
-      "device": "drive-scsi0-0-1",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block250"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "node-name": "#block301"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
deleted file mode 100644
index 6a04e62c0c..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json
+++ /dev/null
@@ -1,114 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-        "format": "raw",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block301",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-        "format": "iscsi",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block250",
-      "backing_file_depth": 0,
-      "drv": "iscsi",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-        "format": "raw",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block169",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"driver\": \"raw\", \"file\": {\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 1073741824,
-        "filename": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-        "format": "iscsi",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block038",
-      "backing_file_depth": 0,
-      "drv": "iscsi",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"lun\": \"0\", \"portal\": \"example.com:3260\", \"driver\": \"iscsi\", \"transport\": \"tcp\", \"target\": \"iqn.2016-09.com.example:server\"}",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
deleted file mode 100644
index 3ffe553404..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result
+++ /dev/null
@@ -1,13 +0,0 @@
-drive-scsi0-0-1
-filename    : 'json:{"lun": "0", "portal": "example.com:3260", "driver": "iscsi", "transport": "tcp", "target": "iqn.2016-09.com.example:server"}'
-format node : '#block301'
-format drv  : 'raw'
-storage node: '#block250'
-storage drv : 'iscsi'
-
-drive-virtio-disk0
-filename    : 'json:{"lun": "0", "portal": "example.com:3260", "driver": "iscsi", "transport": "tcp", "target": "iqn.2016-09.com.example:server"}'
-format node : '#block169'
-format drv  : 'raw'
-storage node: '#block038'
-storage drv : 'iscsi'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
deleted file mode 100644
index 6f971b2afc..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json
+++ /dev/null
@@ -1,58 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block033"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 89560,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 323120536984,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "node-name": "#block136"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
deleted file mode 100644
index 8de6d6c6af..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json
+++ /dev/null
@@ -1,109 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "json:{\"driver\": \"luks\", \"file\": {\"driver\": \"file\", \"filename\": \"/var/lib/libvirt/images/luks\"}, \"key-secret\": \"virtio-disk0-luks-secret0\"}",
-        "format": "luks",
-        "actual-size": 262144,
-        "format-specific": {
-          "type": "luks",
-          "data": {
-            "ivgen-alg": "plain64",
-            "hash-alg": "sha256",
-            "cipher-alg": "aes-256",
-            "uuid": "687ef639-c687-40d3-a103-7b4bdaa6e74a",
-            "cipher-mode": "xts",
-            "slots": [
-              {
-                "active": true,
-                "iters": 1886334,
-                "key-offset": 4096,
-                "stripes": 4000
-              },
-              {
-                "active": false,
-                "key-offset": 262144
-              },
-              {
-                "active": false,
-                "key-offset": 520192
-              },
-              {
-                "active": false,
-                "key-offset": 778240
-              },
-              {
-                "active": false,
-                "key-offset": 1036288
-              },
-              {
-                "active": false,
-                "key-offset": 1294336
-              },
-              {
-                "active": false,
-                "key-offset": 1552384
-              },
-              {
-                "active": false,
-                "key-offset": 1810432
-              }
-            ],
-            "payload-offset": 2068480,
-            "master-key-iters": 484865
-          }
-        },
-        "encrypted": true,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block136",
-      "backing_file_depth": 0,
-      "drv": "luks",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": true,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "json:{\"driver\": \"luks\", \"file\": {\"driver\": \"file\", \"filename\": \"/var/lib/libvirt/images/luks\"}, \"key-secret\": \"virtio-disk0-luks-secret0\"}",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 12554240,
-        "filename": "/var/lib/libvirt/images/luks",
-        "format": "file",
-        "actual-size": 262144,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block033",
-      "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": "/var/lib/libvirt/images/luks",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
deleted file mode 100644
index 6a6b375190..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result
+++ /dev/null
@@ -1,6 +0,0 @@
-drive-virtio-disk0
-filename    : '/var/lib/libvirt/images/luks'
-format node : '#block136'
-format drv  : 'luks'
-storage node: '#block033'
-storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
deleted file mode 100644
index 26c14f9f26..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json
+++ /dev/null
@@ -1,160 +0,0 @@
-[
-    {
-      "device": "drive-virtio-disk0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 32899072,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        }
-      },
-      "stats": {
-        "flush_total_time_ns": 452246313,
-        "wr_highest_offset": 8072282112,
-        "wr_total_time_ns": 4803102521,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 8,
-        "wr_bytes": 6517248,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 11065169148,
-        "flush_operations": 10,
-        "wr_operations": 129,
-        "rd_merged": 77,
-        "rd_bytes": 76399104,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 22663656304,
-        "rd_operations": 4038,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          }
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            }
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          }
-        }
-      }
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
deleted file mode 100644
index 0d4f101c7a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json
+++ /dev/null
@@ -1,2 +0,0 @@
-[
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
deleted file mode 100644
index 9838ad1a7c..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json
+++ /dev/null
@@ -1,329 +0,0 @@
-[
-    {
-      "device": "drive-ide0-0-0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block092"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 61904,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 309814663943,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block232"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "backing": {
-          "parent": {
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block442"
-          },
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "backing": {
-            "parent": {
-              "stats": {
-                "flush_total_time_ns": 0,
-                "wr_highest_offset": 0,
-                "wr_total_time_ns": 0,
-                "failed_wr_operations": 0,
-                "failed_rd_operations": 0,
-                "wr_merged": 0,
-                "wr_bytes": 0,
-                "timed_stats": [
-
-                ],
-                "failed_flush_operations": 0,
-                "account_invalid": false,
-                "rd_total_time_ns": 0,
-                "flush_operations": 0,
-                "wr_operations": 0,
-                "rd_merged": 0,
-                "rd_bytes": 0,
-                "invalid_flush_operations": 0,
-                "account_failed": false,
-                "rd_operations": 0,
-                "invalid_wr_operations": 0,
-                "invalid_rd_operations": 0
-              },
-              "node-name": "#block614"
-            },
-            "stats": {
-              "flush_total_time_ns": 0,
-              "wr_highest_offset": 0,
-              "wr_total_time_ns": 0,
-              "failed_wr_operations": 0,
-              "failed_rd_operations": 0,
-              "wr_merged": 0,
-              "wr_bytes": 0,
-              "timed_stats": [
-
-              ],
-              "failed_flush_operations": 0,
-              "account_invalid": false,
-              "rd_total_time_ns": 0,
-              "flush_operations": 0,
-              "wr_operations": 0,
-              "rd_merged": 0,
-              "rd_bytes": 0,
-              "invalid_flush_operations": 0,
-              "account_failed": false,
-              "rd_operations": 0,
-              "invalid_wr_operations": 0,
-              "invalid_rd_operations": 0
-            },
-            "node-name": "#block797"
-          },
-          "node-name": "#block548"
-        },
-        "node-name": "#block346"
-      },
-      "node-name": "#block118"
-    },
-    {
-      "device": "drive-ide0-0-1",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block1107"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block800"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block927"
-      },
-      "node-name": "#block1290"
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
deleted file mode 100644
index 2fcc3b47ed..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
+++ /dev/null
@@ -1,554 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.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
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/relsnap.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
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block1290",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/relsnap.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block1107",
-      "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": "/var/lib/libvirt/images/relsnap.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.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": true,
-      "node-name": "#block927",
-      "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": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block800",
-      "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": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img0",
-        "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": true,
-      "node-name": "#block797",
-      "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": "/var/lib/libvirt/images/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img0",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block614",
-      "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": "/var/lib/libvirt/images/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img0",
-          "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
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img1",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img0",
-        "backing-filename": "/var/lib/libvirt/images/img0",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block548",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img0",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img1",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block442",
-      "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": "/var/lib/libvirt/images/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/img0",
-            "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
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img1",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/img0",
-          "backing-filename": "/var/lib/libvirt/images/img0",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img1",
-        "backing-filename": "/var/lib/libvirt/images/img1",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block346",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img1",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block232",
-      "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": "/var/lib/libvirt/images/img2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/img0",
-              "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
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/img1",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/img0",
-            "backing-filename": "/var/lib/libvirt/images/img0",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/img1",
-          "backing-filename": "/var/lib/libvirt/images/img1",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img3",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img2",
-        "backing-filename": "/var/lib/libvirt/images/img2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block118",
-      "backing_file_depth": 3,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img3",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img3",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block092",
-      "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": "/var/lib/libvirt/images/img3",
-      "encryption_key_missing": false
-    }
-]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
deleted file mode 100644
index 5288319d30..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result
+++ /dev/null
@@ -1,33 +0,0 @@
-drive-ide0-0-0
-filename    : '/var/lib/libvirt/images/img3'
-format node : '#block118'
-format drv  : 'qcow2'
-storage node: '#block092'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/img2'
-  format node : '#block346'
-  format drv  : 'qcow2'
-  storage node: '#block232'
-  storage drv : 'file'
-    filename    : '/var/lib/libvirt/images/img1'
-    format node : '#block548'
-    format drv  : 'qcow2'
-    storage node: '#block442'
-    storage drv : 'file'
-      filename    : '/var/lib/libvirt/images/img0'
-      format node : '#block797'
-      format drv  : 'qcow2'
-      storage node: '#block614'
-      storage drv : 'file'
-
-drive-ide0-0-1
-filename    : '/var/lib/libvirt/images/relsnap.qcow2'
-format node : '#block1290'
-format drv  : 'qcow2'
-storage node: '#block1107'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/base.qcow2'
-  format node : '#block927'
-  format drv  : 'qcow2'
-  storage node: '#block800'
-  storage drv : 'file'
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
deleted file mode 100644
index 7fd2383013..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json
+++ /dev/null
@@ -1,221 +0,0 @@
-[
-    {
-      "device": "drive-sata0-0-0",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block020"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 290083,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 512,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "idle_time_ns": 74812730779,
-        "rd_operations": 1,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block224"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block320"
-      },
-      "node-name": "#block132"
-    },
-    {
-      "device": "drive-sata0-0-1",
-      "parent": {
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block487"
-      },
-      "stats": {
-        "flush_total_time_ns": 0,
-        "wr_highest_offset": 0,
-        "wr_total_time_ns": 0,
-        "failed_wr_operations": 0,
-        "failed_rd_operations": 0,
-        "wr_merged": 0,
-        "wr_bytes": 0,
-        "timed_stats": [
-
-        ],
-        "failed_flush_operations": 0,
-        "account_invalid": true,
-        "rd_total_time_ns": 0,
-        "flush_operations": 0,
-        "wr_operations": 0,
-        "rd_merged": 0,
-        "rd_bytes": 0,
-        "invalid_flush_operations": 0,
-        "account_failed": true,
-        "rd_operations": 0,
-        "invalid_wr_operations": 0,
-        "invalid_rd_operations": 0
-      },
-      "backing": {
-        "parent": {
-          "stats": {
-            "flush_total_time_ns": 0,
-            "wr_highest_offset": 0,
-            "wr_total_time_ns": 0,
-            "failed_wr_operations": 0,
-            "failed_rd_operations": 0,
-            "wr_merged": 0,
-            "wr_bytes": 0,
-            "timed_stats": [
-
-            ],
-            "failed_flush_operations": 0,
-            "account_invalid": false,
-            "rd_total_time_ns": 0,
-            "flush_operations": 0,
-            "wr_operations": 0,
-            "rd_merged": 0,
-            "rd_bytes": 0,
-            "invalid_flush_operations": 0,
-            "account_failed": false,
-            "rd_operations": 0,
-            "invalid_wr_operations": 0,
-            "invalid_rd_operations": 0
-          },
-          "node-name": "#block692"
-        },
-        "stats": {
-          "flush_total_time_ns": 0,
-          "wr_highest_offset": 0,
-          "wr_total_time_ns": 0,
-          "failed_wr_operations": 0,
-          "failed_rd_operations": 0,
-          "wr_merged": 0,
-          "wr_bytes": 0,
-          "timed_stats": [
-
-          ],
-          "failed_flush_operations": 0,
-          "account_invalid": false,
-          "rd_total_time_ns": 0,
-          "flush_operations": 0,
-          "wr_operations": 0,
-          "rd_merged": 0,
-          "rd_bytes": 0,
-          "invalid_flush_operations": 0,
-          "account_failed": false,
-          "rd_operations": 0,
-          "invalid_wr_operations": 0,
-          "invalid_rd_operations": 0
-        },
-        "node-name": "#block771"
-      },
-      "node-name": "#block548"
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
deleted file mode 100644
index 3945ff5ed8..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
+++ /dev/null
@@ -1,316 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.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": true,
-      "node-name": "#block771",
-      "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": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block692",
-      "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": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.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
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/b.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
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block548",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/b.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/b.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block487",
-      "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": "/var/lib/libvirt/images/b.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.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": true,
-      "node-name": "#block320",
-      "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": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block224",
-      "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": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.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
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a.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
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block132",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/a.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block020",
-      "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": "/var/lib/libvirt/images/a.qcow2",
-      "encryption_key_missing": false
-    }
-  ]
diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
deleted file mode 100644
index 7b12a1746a..0000000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result
+++ /dev/null
@@ -1,23 +0,0 @@
-drive-sata0-0-0
-filename    : '/var/lib/libvirt/images/a.qcow2'
-format node : '#block132'
-format drv  : 'qcow2'
-storage node: '#block020'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/base.qcow2'
-  format node : '#block320'
-  format drv  : 'qcow2'
-  storage node: '#block224'
-  storage drv : 'file'
-
-drive-sata0-0-1
-filename    : '/var/lib/libvirt/images/b.qcow2'
-format node : '#block548'
-format drv  : 'qcow2'
-storage node: '#block487'
-storage drv : 'file'
-  filename    : '/var/lib/libvirt/images/base.qcow2'
-  format node : '#block771'
-  format drv  : 'qcow2'
-  storage node: '#block692'
-  storage drv : 'file'
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index adfe6e1c55..0bff1ed4d0 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2474,80 +2474,6 @@ testQemuMonitorCPUInfo(const void *opaque)
 }


-static int
-testBlockNodeNameDetectFormat(void *payload,
-                              const char *name,
-                              void *opaque)
-{
-    qemuBlockNodeNameBackingChainData *entry = payload;
-    const char *diskalias = name;
-    virBuffer *buf = opaque;
-
-    virBufferSetIndent(buf, 0);
-
-    virBufferAdd(buf, diskalias, -1);
-    virBufferAddLit(buf, "\n");
-
-    while (entry) {
-        virBufferAsprintf(buf, "filename    : '%s'\n", entry->qemufilename);
-        virBufferAsprintf(buf, "format node : '%s'\n",
-                          NULLSTR(entry->nodeformat));
-        virBufferAsprintf(buf, "format drv  : '%s'\n", NULLSTR(entry->drvformat));
-        virBufferAsprintf(buf, "storage node: '%s'\n",
-                          NULLSTR(entry->nodestorage));
-        virBufferAsprintf(buf, "storage drv : '%s'\n", NULLSTR(entry->drvstorage));
-
-        virBufferAdjustIndent(buf, 2);
-
-        entry = entry->backing;
-    }
-
-    virBufferSetIndent(buf, 0);
-    virBufferAddLit(buf, "\n");
-    return 0;
-}
-
-
-static int
-testBlockNodeNameDetect(const void *opaque)
-{
-    const char *testname = opaque;
-    const char *pathprefix = "qemumonitorjsondata/qemumonitorjson-nodename-";
-    g_autofree char *resultFile = NULL;
-    g_autofree char *actual = NULL;
-    g_autoptr(virJSONValue) namedNodesJson = NULL;
-    g_autoptr(virJSONValue) blockstatsJson = NULL;
-    g_autoptr(GHashTable) nodedata = NULL;
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-
-    resultFile = g_strdup_printf("%s/%s%s.result", abs_srcdir, pathprefix,
-                                 testname);
-
-    if (!(namedNodesJson = virTestLoadFileJSON(pathprefix, testname,
-                                               "-named-nodes.json", NULL)))
-        return -1;
-
-    if (!(blockstatsJson = virTestLoadFileJSON(pathprefix, testname,
-                                               "-blockstats.json", NULL)))
-        return -1;
-
-    if (!(nodedata = qemuBlockNodeNameGetBackingChain(namedNodesJson,
-                                                      blockstatsJson)))
-        return -1;
-
-    virHashForEachSorted(nodedata, testBlockNodeNameDetectFormat, &buf);
-
-    virBufferTrim(&buf, "\n");
-
-    actual = virBufferContentAndReset(&buf);
-
-    if (virTestCompareToFile(actual, resultFile) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 struct testQAPISchemaData {
     GHashTable *schema;
     const char *name;
@@ -3127,24 +3053,6 @@ mymain(void)

     DO_TEST_CPU_INFO_FAST("s390-fast", 2);

-#define DO_TEST_BLOCK_NODE_DETECT(testname) \
-    do { \
-        if (virTestRun("node-name-detect(" testname ")", \
-                       testBlockNodeNameDetect, testname) < 0) \
-            ret = -1; \
-    } while (0)
-
-    DO_TEST_BLOCK_NODE_DETECT("basic");
-    DO_TEST_BLOCK_NODE_DETECT("same-backing");
-    DO_TEST_BLOCK_NODE_DETECT("relative");
-    DO_TEST_BLOCK_NODE_DETECT("gluster");
-    DO_TEST_BLOCK_NODE_DETECT("blockjob");
-    DO_TEST_BLOCK_NODE_DETECT("luks");
-    DO_TEST_BLOCK_NODE_DETECT("iscsi");
-    DO_TEST_BLOCK_NODE_DETECT("old");
-    DO_TEST_BLOCK_NODE_DETECT("empty");
-
-#undef DO_TEST_BLOCK_NODE_DETECT

 #define DO_TEST_QAPI_QUERY(nme, qry, scc, rplobj) \
     do { \
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:18 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:18 +0200
Subject: [PATCH 40/80] qemu: monitor: Remove unused
 qemuMonitorQueryNamedBlockNodes and clean up
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <7b56f53e2ede5e803673dbc84ae3c71d88e6baf7.1658843187.git.pkrempa@redhat.com>

The top level API is unused so it can be removed but internally the JSON
version is called by other monitor commands which extract information
from the reply.

Thus qemuMonitorJSONQueryNamedBlockNodes is unexported and moved
appropriately.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      |  9 -------
 src/qemu/qemu_monitor.h      |  2 --
 src/qemu/qemu_monitor_json.c | 52 +++++++++++++++++++++---------------
 src/qemu/qemu_monitor_json.h |  5 ----
 4 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index a58aa5622f..a4b1b90c7c 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3995,15 +3995,6 @@ qemuMonitorSetBlockThreshold(qemuMonitor *mon,
 }


-virJSONValue *
-qemuMonitorQueryNamedBlockNodes(qemuMonitor *mon)
-{
-    QEMU_CHECK_MONITOR_NULL(mon);
-
-    return qemuMonitorJSONQueryNamedBlockNodes(mon, false);
-}
-
-
 char *
 qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfo *info)
 {
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 0e3640c1da..352cf0ada5 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1335,8 +1335,6 @@ int qemuMonitorSetBlockThreshold(qemuMonitor *mon,
                                  const char *nodename,
                                  unsigned long long threshold);

-virJSONValue *qemuMonitorQueryNamedBlockNodes(qemuMonitor *mon);
-
 int qemuMonitorSetWatchdogAction(qemuMonitor *mon,
                                  const char *action);

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 4584786872..9363f86a55 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2056,6 +2056,36 @@ qemuMonitorJSONSetDBusVMStateIdList(qemuMonitor *mon,
 }


+/* qemuMonitorJSONQueryNamedBlockNodes:
+ * @mon: Monitor pointer
+ *
+ * This helper will attempt to make a "query-named-block-nodes" call and check for
+ * errors before returning with the reply.
+ *
+ * Returns: NULL on error, reply on success
+ */
+static virJSONValue *
+qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon,
+                                    bool flat)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-named-block-nodes",
+                                           "B:flat", flat,
+                                           NULL)))
+        return NULL;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return NULL;
+
+    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
+        return NULL;
+
+    return virJSONValueObjectStealArray(reply, "return");
+}
+
+
 /* qemuMonitorJSONQueryBlock:
  * @mon: Monitor pointer
  *
@@ -7882,28 +7912,6 @@ qemuMonitorJSONSetBlockThreshold(qemuMonitor *mon,
 }


-virJSONValue *
-qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon,
-                                    bool flat)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    if (!(cmd = qemuMonitorJSONMakeCommand("query-named-block-nodes",
-                                           "B:flat", flat,
-                                           NULL)))
-        return NULL;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return NULL;
-
-    if (qemuMonitorJSONCheckReply(cmd, reply, VIR_JSON_TYPE_ARRAY) < 0)
-        return NULL;
-
-    return virJSONValueObjectStealArray(reply, "return");
-}
-
-
 int
 qemuMonitorJSONSetWatchdogAction(qemuMonitor *mon,
                                  const char *action)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 613b251908..31f6214ec4 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -713,11 +713,6 @@ qemuMonitorJSONSetBlockThreshold(qemuMonitor *mon,
                                  unsigned long long threshold)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

-virJSONValue *
-qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon,
-                                    bool flat)
-    ATTRIBUTE_NONNULL(1);
-
 int
 qemuMonitorJSONSetWatchdogAction(qemuMonitor *mon,
                                  const char *action)
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:11 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:11 +0200
Subject: [PATCH 33/80] qemu: monitor: Remove infrastructure for BLOCK_JOB_*
 events
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <a9f8d400b7c74e5302f305df155da7a73ca0af21.1658843187.git.pkrempa@redhat.com>

We no longer need it as we use the more modern job events.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 14 ------
 src/qemu/qemu_monitor.h      | 12 -----
 src/qemu/qemu_monitor_json.c | 90 ------------------------------------
 3 files changed, 116 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index b575eaae06..a58aa5622f 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1255,20 +1255,6 @@ qemuMonitorEmitPMSuspendDisk(qemuMonitor *mon)
 }


-void
-qemuMonitorEmitBlockJob(qemuMonitor *mon,
-                        const char *diskAlias,
-                        int type,
-                        int status,
-                        const char *error)
-{
-    VIR_DEBUG("mon=%p", mon);
-
-    QEMU_MONITOR_CALLBACK(mon, domainBlockJob, mon->vm,
-                          diskAlias, type, status, error);
-}
-
-
 void
 qemuMonitorEmitJobStatusChange(qemuMonitor *mon,
                                const char *jobname,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 916a86f423..0e3640c1da 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -222,12 +222,6 @@ typedef void (*qemuMonitorDomainGraphicsCallback)(qemuMonitor *mon,
                                                   const char *authScheme,
                                                   const char *x509dname,
                                                   const char *saslUsername);
-typedef void (*qemuMonitorDomainBlockJobCallback)(qemuMonitor *mon,
-                                                  virDomainObj *vm,
-                                                  const char *diskAlias,
-                                                  int type,
-                                                  int status,
-                                                  const char *error);
 typedef void (*qemuMonitorDomainJobStatusChangeCallback)(qemuMonitor *mon,
                                                          virDomainObj *vm,
                                                          const char *jobname,
@@ -381,7 +375,6 @@ struct _qemuMonitorCallbacks {
     qemuMonitorDomainWatchdogCallback domainWatchdog;
     qemuMonitorDomainIOErrorCallback domainIOError;
     qemuMonitorDomainGraphicsCallback domainGraphics;
-    qemuMonitorDomainBlockJobCallback domainBlockJob;
     qemuMonitorDomainJobStatusChangeCallback jobStatusChange;
     qemuMonitorDomainTrayChangeCallback domainTrayChange;
     qemuMonitorDomainPMWakeupCallback domainPMWakeup;
@@ -476,11 +469,6 @@ void qemuMonitorEmitTrayChange(qemuMonitor *mon,
                                int reason);
 void qemuMonitorEmitPMWakeup(qemuMonitor *mon);
 void qemuMonitorEmitPMSuspend(qemuMonitor *mon);
-void qemuMonitorEmitBlockJob(qemuMonitor *mon,
-                             const char *diskAlias,
-                             int type,
-                             int status,
-                             const char *error);
 void qemuMonitorEmitJobStatusChange(qemuMonitor *mon,
                                     const char *jobname,
                                     qemuMonitorJobStatus status);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 8cda6f36b7..4584786872 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -65,9 +65,6 @@ static void qemuMonitorJSONHandleSPICEDisconnect(qemuMonitor *mon, virJSONValue
 static void qemuMonitorJSONHandleTrayChange(qemuMonitor *mon, virJSONValue *data);
 static void qemuMonitorJSONHandlePMWakeup(qemuMonitor *mon, virJSONValue *data);
 static void qemuMonitorJSONHandlePMSuspend(qemuMonitor *mon, virJSONValue *data);
-static void qemuMonitorJSONHandleBlockJobCompleted(qemuMonitor *mon, virJSONValue *data);
-static void qemuMonitorJSONHandleBlockJobCanceled(qemuMonitor *mon, virJSONValue *data);
-static void qemuMonitorJSONHandleBlockJobReady(qemuMonitor *mon, virJSONValue *data);
 static void qemuMonitorJSONHandleJobStatusChange(qemuMonitor *mon, virJSONValue *data);
 static void qemuMonitorJSONHandleBalloonChange(qemuMonitor *mon, virJSONValue *data);
 static void qemuMonitorJSONHandlePMSuspendDisk(qemuMonitor *mon, virJSONValue *data);
@@ -97,9 +94,6 @@ static qemuEventHandler eventHandlers[] = {
     { "ACPI_DEVICE_OST", qemuMonitorJSONHandleAcpiOstInfo, },
     { "BALLOON_CHANGE", qemuMonitorJSONHandleBalloonChange, },
     { "BLOCK_IO_ERROR", qemuMonitorJSONHandleIOError, },
-    { "BLOCK_JOB_CANCELLED", qemuMonitorJSONHandleBlockJobCanceled, },
-    { "BLOCK_JOB_COMPLETED", qemuMonitorJSONHandleBlockJobCompleted, },
-    { "BLOCK_JOB_READY", qemuMonitorJSONHandleBlockJobReady, },
     { "BLOCK_WRITE_THRESHOLD", qemuMonitorJSONHandleBlockThreshold, },
     { "DEVICE_DELETED", qemuMonitorJSONHandleDeviceDeleted, },
     { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, },
@@ -895,67 +889,6 @@ static void qemuMonitorJSONHandleSPICEDisconnect(qemuMonitor *mon, virJSONValue
     qemuMonitorJSONHandleGraphicsSPICE(mon, data, VIR_DOMAIN_EVENT_GRAPHICS_DISCONNECT);
 }

-static void
-qemuMonitorJSONHandleBlockJobImpl(qemuMonitor *mon,
-                                  virJSONValue *data,
-                                  int event)
-{
-    const char *device;
-    const char *type_str;
-    const char *error = NULL;
-    int type = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
-    unsigned long long offset, len;
-
-    if ((device = virJSONValueObjectGetString(data, "device")) == NULL) {
-        VIR_WARN("missing device in block job event");
-        goto out;
-    }
-
-    if (virJSONValueObjectGetNumberUlong(data, "offset", &offset) < 0) {
-        VIR_WARN("missing offset in block job event");
-        goto out;
-    }
-
-    if (virJSONValueObjectGetNumberUlong(data, "len", &len) < 0) {
-        VIR_WARN("missing len in block job event");
-        goto out;
-    }
-
-    if ((type_str = virJSONValueObjectGetString(data, "type")) == NULL) {
-        VIR_WARN("missing type in block job event");
-        goto out;
-    }
-
-    if (STREQ(type_str, "stream"))
-        type = VIR_DOMAIN_BLOCK_JOB_TYPE_PULL;
-    else if (STREQ(type_str, "commit"))
-        type = VIR_DOMAIN_BLOCK_JOB_TYPE_COMMIT;
-    else if (STREQ(type_str, "mirror"))
-        type = VIR_DOMAIN_BLOCK_JOB_TYPE_COPY;
-    else if (STREQ(type_str, "backup"))
-        type = VIR_DOMAIN_BLOCK_JOB_TYPE_BACKUP;
-
-    switch ((virConnectDomainEventBlockJobStatus) event) {
-    case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
-        error = virJSONValueObjectGetString(data, "error");
-        /* Make sure the whole device has been processed */
-        if (offset != len || error)
-            event = VIR_DOMAIN_BLOCK_JOB_FAILED;
-        break;
-    case VIR_DOMAIN_BLOCK_JOB_CANCELED:
-    case VIR_DOMAIN_BLOCK_JOB_READY:
-        break;
-    case VIR_DOMAIN_BLOCK_JOB_FAILED:
-    case VIR_DOMAIN_BLOCK_JOB_LAST:
-        VIR_DEBUG("should not get here");
-        break;
-    }
-
- out:
-    qemuMonitorEmitBlockJob(mon, device, type, event, error);
-}
-
-
 static void
 qemuMonitorJSONHandleJobStatusChange(qemuMonitor *mon,
                                      virJSONValue *data)
@@ -1024,29 +957,6 @@ qemuMonitorJSONHandlePMSuspend(qemuMonitor *mon,
     qemuMonitorEmitPMSuspend(mon);
 }

-static void
-qemuMonitorJSONHandleBlockJobCompleted(qemuMonitor *mon,
-                                       virJSONValue *data)
-{
-    qemuMonitorJSONHandleBlockJobImpl(mon, data,
-                                      VIR_DOMAIN_BLOCK_JOB_COMPLETED);
-}
-
-static void
-qemuMonitorJSONHandleBlockJobCanceled(qemuMonitor *mon,
-                                       virJSONValue *data)
-{
-    qemuMonitorJSONHandleBlockJobImpl(mon, data,
-                                      VIR_DOMAIN_BLOCK_JOB_CANCELED);
-}
-
-static void
-qemuMonitorJSONHandleBlockJobReady(qemuMonitor *mon,
-                                   virJSONValue *data)
-{
-    qemuMonitorJSONHandleBlockJobImpl(mon, data,
-                                      VIR_DOMAIN_BLOCK_JOB_READY);
-}

 static void
 qemuMonitorJSONHandleBalloonChange(qemuMonitor *mon,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:20 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:20 +0200
Subject: [PATCH 42/80] qemu: monitor: Remove unused qemuMonitorDriveMirror
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <9b0a608f927e8450d69f6369ed4a7c32318d5a64.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 21 ------------------
 src/qemu/qemu_monitor.h      | 10 ---------
 src/qemu/qemu_monitor_json.c | 41 ------------------------------------
 src/qemu/qemu_monitor_json.h | 11 ----------
 tests/qemumonitorjsontest.c  |  2 --
 5 files changed, 85 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index a4b1b90c7c..9c24b842bd 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2871,27 +2871,6 @@ qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name)
 }


-/* Start a drive-mirror block job.  bandwidth is in bytes/sec.  */
-int
-qemuMonitorDriveMirror(qemuMonitor *mon,
-                       const char *device, const char *file,
-                       const char *format, unsigned long long bandwidth,
-                       unsigned int granularity, unsigned long long buf_size,
-                       bool shallow,
-                       bool reuse)
-{
-    VIR_DEBUG("device=%s, file=%s, format=%s, bandwidth=%lld, "
-              "granularity=%#x, buf_size=%lld, shallow=%d, reuse=%d",
-              device, file, NULLSTR(format), bandwidth, granularity,
-              buf_size, shallow, reuse);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONDriveMirror(mon, device, file, format, bandwidth,
-                                      granularity, buf_size, shallow, reuse);
-}
-
-
 int
 qemuMonitorBlockdevMirror(qemuMonitor *mon,
                           const char *jobname,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 352cf0ada5..aee9ca0e6a 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -979,16 +979,6 @@ int qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name);

 int qemuMonitorTransaction(qemuMonitor *mon, virJSONValue **actions)
     ATTRIBUTE_NONNULL(2);
-int qemuMonitorDriveMirror(qemuMonitor *mon,
-                           const char *device,
-                           const char *file,
-                           const char *format,
-                           unsigned long long bandwidth,
-                           unsigned int granularity,
-                           unsigned long long buf_size,
-                           bool shallow,
-                           bool reuse)
-    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
 int qemuMonitorBlockdevMirror(qemuMonitor *mon,
                               const char *jobname,
                               bool persistjob,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 9363f86a55..bd3130075b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4096,47 +4096,6 @@ qemuMonitorJSONDelObject(qemuMonitor *mon,
 }


-/* speed is in bytes/sec */
-int
-qemuMonitorJSONDriveMirror(qemuMonitor *mon,
-                           const char *device, const char *file,
-                           const char *format, unsigned long long speed,
-                           unsigned int granularity,
-                           unsigned long long buf_size,
-                           bool shallow,
-                           bool reuse)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-    const char *syncmode = "full";
-    const char *mode = "absolute-paths";
-
-    if (shallow)
-        syncmode = "top";
-
-    if (reuse)
-        mode = "existing";
-
-    cmd = qemuMonitorJSONMakeCommand("drive-mirror",
-                                     "s:device", device,
-                                     "s:target", file,
-                                     "Y:speed", speed,
-                                     "z:granularity", granularity,
-                                     "P:buf-size", buf_size,
-                                     "s:sync", syncmode,
-                                     "s:mode", mode,
-                                     "S:format", format,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    return qemuMonitorJSONCheckError(cmd, reply);
-}
-
-
 int
 qemuMonitorJSONBlockdevMirror(qemuMonitor *mon,
                               const char *jobname,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 31f6214ec4..f409480c0b 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -305,17 +305,6 @@ int
 qemuMonitorJSONTransaction(qemuMonitor *mon,
                            virJSONValue **actions)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-int
-qemuMonitorJSONDriveMirror(qemuMonitor *mon,
-                           const char *device,
-                           const char *file,
-                           const char *format,
-                           unsigned long long speed,
-                           unsigned int granularity,
-                           unsigned long long buf_size,
-                           bool shallow,
-                           bool reuse)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);

 int
 qemuMonitorJSONBlockdevMirror(qemuMonitor *mon,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 0bff1ed4d0..265fa0b705 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1213,7 +1213,6 @@ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
               "localhost", 12345, 12346, "certsubjectval")
 GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
 GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
-GEN_TEST_FUNC(qemuMonitorJSONDriveMirror, "vdb", "/foo/bar", "formatstr", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/bar1", "backingnode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", true, "/foo/bar1", "topnode", "/foo/bar2", "basenode", "backingfilename", 1024)
@@ -3001,7 +3000,6 @@ mymain(void)
     DO_TEST_GEN(qemuMonitorJSONGraphicsRelocate);
     DO_TEST_GEN(qemuMonitorJSONRemoveNetdev);
     DO_TEST_GEN(qemuMonitorJSONDelDevice);
-    DO_TEST_GEN(qemuMonitorJSONDriveMirror);
     DO_TEST_GEN(qemuMonitorJSONBlockdevMirror);
     DO_TEST_GEN(qemuMonitorJSONBlockStream);
     DO_TEST_GEN(qemuMonitorJSONBlockCommit);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:12 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:12 +0200
Subject: [PATCH 34/80] qemuDomainSetBlockThreshold: Remove pre-blockdev node
 name detection
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <9e24c9bcb5eabddad5138544095338139fc037a9.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1e7f17b750..e7b0acd46f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19809,18 +19809,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom,
         goto endjob;
     }

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        !src->nodestorage &&
-        qemuBlockNodeNamesDetect(driver, vm, VIR_ASYNC_JOB_NONE) < 0)
-        goto endjob;
-
-    if (!src->nodestorage) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-                       _("threshold currently can't be set for block device '%s'"),
-                       dev);
-        goto endjob;
-    }
-
     nodename = g_strdup(src->nodestorage);

     qemuDomainObjEnterMonitor(driver, vm);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:14 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:14 +0200
Subject: [PATCH 36/80] qemu: blockjob: Remove pre-blockdev blockjob setup
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <6934b30d6b86a6d3d7e743423b7cc07941103e14.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_blockjob.c | 30 +++---------------------------
 1 file changed, 3 insertions(+), 27 deletions(-)

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 304008a31a..03c46923b3 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -250,16 +250,8 @@ qemuBlockJobDiskNewPull(virDomainObj *vm,
                         virStorageSource *base,
                         unsigned int jobflags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(qemuBlockJobData) job = NULL;
-    g_autofree char *jobname = NULL;
-
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        jobname = g_strdup_printf("pull-%s-%s", disk->dst, disk->src->nodeformat);
-    } else {
-        if (!(jobname = qemuAliasDiskDriveFromDisk(disk)))
-            return NULL;
-    }
+    g_autofree char *jobname = g_strdup_printf("pull-%s-%s", disk->dst, disk->src->nodeformat);

     if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_PULL, jobname)))
         return NULL;
@@ -283,21 +275,13 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm,
                           bool delete_imgs,
                           unsigned int jobflags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(qemuBlockJobData) job = NULL;
-    g_autofree char *jobname = NULL;
+    g_autofree char *jobname = g_strdup_printf("commit-%s-%s", disk->dst, top->nodeformat);
     qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT;

     if (topparent == NULL)
         jobtype = QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT;

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        jobname = g_strdup_printf("commit-%s-%s", disk->dst, top->nodeformat);
-    } else {
-        if (!(jobname = qemuAliasDiskDriveFromDisk(disk)))
-            return NULL;
-    }
-
     if (!(job = qemuBlockJobDataNew(jobtype, jobname)))
         return NULL;

@@ -352,16 +336,8 @@ qemuBlockJobDiskNewCopy(virDomainObj *vm,
                         bool reuse,
                         unsigned int jobflags)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(qemuBlockJobData) job = NULL;
-    g_autofree char *jobname = NULL;
-
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        jobname = g_strdup_printf("copy-%s-%s", disk->dst, disk->src->nodeformat);
-    } else {
-        if (!(jobname = qemuAliasDiskDriveFromDisk(disk)))
-            return NULL;
-    }
+    g_autofree char *jobname = g_strdup_printf("copy-%s-%s", disk->dst, disk->src->nodeformat);

     if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_COPY, jobname)))
         return NULL;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:24 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:24 +0200
Subject: [PATCH 46/80] qemu: monitor: Remove unused arguments of
 qemuMonitorBlockStream
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <809bea8638f9643b35cd7052e29f9d68cc826edc.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c       |  2 --
 src/qemu/qemu_monitor.c      | 15 +++------------
 src/qemu/qemu_monitor.h      |  2 --
 src/qemu/qemu_monitor_json.c | 12 ++----------
 src/qemu/qemu_monitor_json.h |  2 --
 tests/qemumonitorjsontest.c  |  2 +-
 6 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7a2d8dde5e..e4caccfbd9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14547,8 +14547,6 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
     ret = qemuMonitorBlockStream(priv->mon,
                                  disk->src->nodeformat,
                                  job->name,
-                                 true,
-                                 NULL,
                                  nodebase,
                                  backingPath,
                                  speed);
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 1453181f94..15fe6690e9 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3016,26 +3016,17 @@ int
 qemuMonitorBlockStream(qemuMonitor *mon,
                        const char *device,
                        const char *jobname,
-                       bool persistjob,
-                       const char *base,
                        const char *baseNode,
                        const char *backingName,
                        unsigned long long bandwidth)
 {
-    VIR_DEBUG("device=%s, jobname=%s, persistjob=%d, base=%s, baseNode=%s, "
-              "backingName=%s, bandwidth=%lluB",
-              device, NULLSTR(jobname), persistjob, NULLSTR(base),
+    VIR_DEBUG("device=%s, jobname=%s, baseNode=%s, backingName=%s, bandwidth=%lluB",
+              device, NULLSTR(jobname),
               NULLSTR(baseNode), NULLSTR(backingName), bandwidth);

     QEMU_CHECK_MONITOR(mon);

-    if (base && baseNode) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("'base' and 'baseNode' can't be used together"));
-        return -1;
-    }
-
-    return qemuMonitorJSONBlockStream(mon, device, jobname, persistjob, base,
+    return qemuMonitorJSONBlockStream(mon, device, jobname,
                                       baseNode, backingName, bandwidth);
 }

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 7aed4ffd4f..89b2348775 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1029,8 +1029,6 @@ int qemuMonitorSendKey(qemuMonitor *mon,
 int qemuMonitorBlockStream(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long bandwidth)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index e6eb41d85b..e569cf27be 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4531,27 +4531,19 @@ int
 qemuMonitorJSONBlockStream(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long speed)
 {
     g_autoptr(virJSONValue) cmd = NULL;
     g_autoptr(virJSONValue) reply = NULL;
-    virTristateBool autofinalize = VIR_TRISTATE_BOOL_ABSENT;
-    virTristateBool autodismiss = VIR_TRISTATE_BOOL_ABSENT;
-
-    if (persistjob) {
-        autofinalize = VIR_TRISTATE_BOOL_YES;
-        autodismiss = VIR_TRISTATE_BOOL_NO;
-    }
+    virTristateBool autofinalize = VIR_TRISTATE_BOOL_YES;
+    virTristateBool autodismiss = VIR_TRISTATE_BOOL_NO;

     if (!(cmd = qemuMonitorJSONMakeCommand("block-stream",
                                            "s:device", device,
                                            "S:job-id", jobname,
                                            "Y:speed", speed,
-                                           "S:base", base,
                                            "S:base-node", baseNode,
                                            "S:backing-file", backingName,
                                            "T:auto-finalize", autofinalize,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 9da26ca646..4f780e02aa 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -367,8 +367,6 @@ int
 qemuMonitorJSONBlockStream(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long speed)
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index d5915720c8..f1c403d5b3 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1214,7 +1214,7 @@ GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
 GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
 GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
-GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/bar1", "backingnode", "backingfilename", 1024)
+GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", "backingnode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
 GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar")
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:17 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:17 +0200
Subject: [PATCH 39/80] qemu: block: Remove unused qemuBlockGetNodeData
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <ed43059856488582dd43c453e0a913db8ae23754.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c | 40 ----------------------------------------
 src/qemu/qemu_block.h |  3 ---
 2 files changed, 43 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index ea0b783bbb..6e643598bc 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -52,46 +52,6 @@ qemuBlockNodeNameValidate(const char *nn)
 }


-static int
-qemuBlockNamedNodesArrayToHash(size_t pos G_GNUC_UNUSED,
-                               virJSONValue *item,
-                               void *opaque)
-{
-    GHashTable *table = opaque;
-    const char *name;
-
-    if (!(name = virJSONValueObjectGetString(item, "node-name")))
-        return 1;
-
-    if (virHashAddEntry(table, name, item) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-/**
- * qemuBlockGetNodeData:
- * @data: JSON object returned from query-named-block-nodes
- *
- * Returns a hash table organized by the node name of the JSON value objects of
- * data for given qemu block nodes.
- *
- * Returns a filled GHashTable *on success NULL on error.
- */
-GHashTable *
-qemuBlockGetNodeData(virJSONValue *data)
-{
-    g_autoptr(GHashTable) nodedata = virHashNew(virJSONValueHashFree);
-
-    if (virJSONValueArrayForeachSteal(data,
-                                      qemuBlockNamedNodesArrayToHash, nodedata) < 0)
-        return NULL;
-
-    return g_steal_pointer(&nodedata);
-}
-
-
 /**
  * qemuBlockStorageSourceSupportsConcurrentAccess:
  * @src: disk storage source
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 134ce41dd5..422c1a0deb 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -39,9 +39,6 @@ struct qemuBlockNodeNameBackingChainData {
     char *drvstorage;
 };

-GHashTable *
-qemuBlockGetNodeData(virJSONValue *data);
-
 bool
 qemuBlockStorageSourceSupportsConcurrentAccess(virStorageSource *src);

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:26 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:26 +0200
Subject: [PATCH 48/80] qemu: driver: Remove pre-blockdev code paths from
 qemuDomainBlockPivot
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <47d6942665c6c01460b2308d2e37c9bf47b4c142.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 50 +++++++++++++++++++-----------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e4caccfbd9..f1fc954f8c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14339,9 +14339,9 @@ qemuDomainBlockPivot(virQEMUDriver *driver,
     g_autoptr(qemuBlockStorageSourceChainData) chainattachdata = NULL;
     int ret = -1;
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     g_autoptr(virJSONValue) bitmapactions = NULL;
     g_autoptr(virJSONValue) reopenactions = NULL;
+    int rc = 0;

     if (job->state != QEMU_BLOCKJOB_STATE_READY) {
         virReportError(VIR_ERR_BLOCK_COPY_ACTIVE,
@@ -14369,7 +14369,7 @@ qemuDomainBlockPivot(virQEMUDriver *driver,
         return -1;

     case QEMU_BLOCKJOB_TYPE_COPY:
-        if (blockdev && !job->jobflagsmissing) {
+        if (!job->jobflagsmissing) {
             bool shallow = job->jobflags & VIR_DOMAIN_BLOCK_COPY_SHALLOW;
             bool reuse = job->jobflags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT;

@@ -14406,41 +14406,35 @@ qemuDomainBlockPivot(virQEMUDriver *driver,
         break;

     case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
-        if (blockdev) {
-            bitmapactions = virJSONValueNewArray();
-
-            if (qemuMonitorTransactionBitmapAdd(bitmapactions,
-                                                job->data.commit.base->nodeformat,
-                                                "libvirt-tmp-activewrite",
-                                                false,
-                                                false,
-                                                0) < 0)
-                return -1;
-        }
+        bitmapactions = virJSONValueNewArray();
+
+        if (qemuMonitorTransactionBitmapAdd(bitmapactions,
+                                            job->data.commit.base->nodeformat,
+                                            "libvirt-tmp-activewrite",
+                                            false,
+                                            false,
+                                            0) < 0)
+            return -1;

         break;
     }

     qemuDomainObjEnterMonitor(driver, vm);
-    if (blockdev) {
-        int rc = 0;

-        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 (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 (bitmapactions && rc == 0)
-            ignore_value(qemuMonitorTransaction(priv->mon, &bitmapactions));
+    if (bitmapactions && rc == 0)
+        ignore_value(qemuMonitorTransaction(priv->mon, &bitmapactions));
+
+    if (rc == 0)
+        ret = qemuMonitorJobComplete(priv->mon, job->name);

-        if (rc == 0)
-            ret = qemuMonitorJobComplete(priv->mon, job->name);
-    } else {
-        ret = qemuMonitorDrivePivot(priv->mon, job->name);
-    }
     qemuDomainObjExitMonitor(vm);

     /* The pivot failed. The block job in QEMU remains in the synchronised state */
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:16 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:16 +0200
Subject: [PATCH 38/80] qemuDomainGetStatsBlock: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <95fc1256e6ffe37df3c55608a3970988230856de.1658843187.git.pkrempa@redhat.com>

This function and it's callees were a bit more entangled so remove the
pre-blockdev code separately.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 80 +++++++-----------------------------------
 1 file changed, 12 insertions(+), 68 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e7b0acd46f..811b4a610c 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18245,42 +18245,6 @@ qemuDomainGetStatsOneBlockFallback(virQEMUDriver *driver,
 }


-/**
- * qemuDomainGetStatsOneBlockRefreshNamed:
- * @src: disk source structure
- * @alias: disk alias
- * @stats: hash table containing stats for all disks
- * @nodedata: reply containing 'query-named-block-nodes' data
- *
- * Refresh disk block stats data (qemuBlockStats *) which are present only
- * in the reply of 'query-named-block-nodes' in cases when the data was gathered
- * by using query-block originally.
- */
-static void
-qemuDomainGetStatsOneBlockRefreshNamed(virStorageSource *src,
-                                       const char *alias,
-                                       GHashTable *stats,
-                                       GHashTable *nodedata)
-{
-    qemuBlockStats *entry;
-
-    virJSONValue *data;
-    unsigned long long tmp;
-
-    if (!nodedata || !src->nodestorage)
-        return;
-
-    if (!(entry = virHashLookup(stats, alias)))
-        return;
-
-    if (!(data = virHashLookup(nodedata, src->nodestorage)))
-        return;
-
-    if (virJSONValueObjectGetNumberUlong(data, "write_threshold", &tmp) == 0)
-        entry->write_threshold = tmp;
-}
-
-
 static int
 qemuDomainGetStatsOneBlock(virQEMUDriver *driver,
                            virQEMUDriverConfig *cfg,
@@ -18403,20 +18367,15 @@ qemuDomainGetStatsBlockExportHeader(virDomainDiskDef *disk,
 static int
 qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
                                   GHashTable *stats,
-                                  GHashTable *nodestats,
                                   virTypedParamList *params,
                                   size_t *recordnr,
                                   bool visitBacking,
                                   virQEMUDriver *driver,
                                   virQEMUDriverConfig *cfg,
-                                  virDomainObj *dom,
-                                  bool blockdev)
+                                  virDomainObj *dom)

 {
     virStorageSource *n;
-    const char *frontendalias;
-    const char *backendalias;
-    const char *backendstoragealias;

     /*
      * This helps to keep logs clean from error messages on getting stats
@@ -18452,9 +18411,10 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,

     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
         g_autofree char *alias = NULL;
+        const char *frontendalias;
+        const char *backendalias;
+        const char *backendstoragealias;

-        /* for 'sd' disks we won't be displaying stats for the backing chain
-         * as we don't update the stats correctly */
         if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
             frontendalias = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
             backendalias = n->nodeformat;
@@ -18465,7 +18425,8 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
                 !(alias = qemuDomainStorageAlias(disk->info.alias, n->id)))
                 return -1;

-            qemuDomainGetStatsOneBlockRefreshNamed(n, alias, stats, nodestats);
+            /* for 'sd' disks we won't be displaying stats for the backing chain
+             * as we don't update the stats correctly */

             frontendalias = alias;
             backendalias = alias;
@@ -18501,7 +18462,7 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDef *disk,
     /* in blockdev mode where we can properly and uniquely identify images we
      * can also report stats for the mirror target or the scratch image or target
      * of a backup operation */
-    if (visitBacking && blockdev) {
+    if (visitBacking) {
         qemuDomainObjPrivate *priv = dom->privateData;

         if (disk->mirror &&
@@ -18571,13 +18532,8 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver,
     size_t i;
     int rc;
     g_autoptr(GHashTable) stats = NULL;
-    g_autoptr(GHashTable) nodestats = NULL;
-    g_autoptr(virJSONValue) nodedata = NULL;
     qemuDomainObjPrivate *priv = dom->privateData;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
-    bool fetchnodedata = virQEMUCapsGet(priv->qemuCaps,
-                                        QEMU_CAPS_QUERY_NAMED_BLOCK_NODES) && !blockdev;
     int count_index = -1;
     size_t visited = 0;
     bool visitBacking = !!(privflags & QEMU_DOMAIN_STATS_BACKING);
@@ -18587,27 +18543,16 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver,

         rc = qemuMonitorGetAllBlockStatsInfo(priv->mon, &stats);

-        if (rc >= 0) {
-            if (blockdev)
-                rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats);
-            else
-                ignore_value(qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats));
-        }
-
-        if (fetchnodedata)
-            nodedata = qemuMonitorQueryNamedBlockNodes(priv->mon);
+        if (rc >= 0)
+            rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats);

         qemuDomainObjExitMonitor(dom);

         /* failure to retrieve stats is fine at this point */
-        if (rc < 0 || (fetchnodedata && !nodedata))
+        if (rc < 0)
             virResetLastError();
     }

-    if (nodedata &&
-        !(nodestats = qemuBlockGetNodeData(nodedata)))
-        return -1;
-
     /* When listing backing chains, it's easier to fix up the count
      * after the iteration than it is to iterate twice; but we still
      * want count listed first.  */
@@ -18616,10 +18561,9 @@ qemuDomainGetStatsBlock(virQEMUDriver *driver,
         return -1;

     for (i = 0; i < dom->def->ndisks; i++) {
-        if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats, nodestats,
+        if (qemuDomainGetStatsBlockExportDisk(dom->def->disks[i], stats,
                                               params, &visited,
-                                              visitBacking, driver, cfg, dom,
-                                              blockdev) < 0)
+                                              visitBacking, driver, cfg, dom) < 0)
             return -1;
     }

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:21 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:21 +0200
Subject: [PATCH 43/80] qemu: driver: Remove pre-blockdev code paths from
 qemuDomainBlockCommit
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <1d49a270b57c25c871441115b675d146a071d366.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 60 +++++++++---------------------------------
 1 file changed, 13 insertions(+), 47 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index bae9558cfd..e8dc524186 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15469,24 +15469,16 @@ qemuDomainBlockCommit(virDomainPtr dom,
     virQEMUDriver *driver = dom->conn->privateData;
     qemuDomainObjPrivate *priv;
     virDomainObj *vm = NULL;
-    const char *device = NULL;
-    const char *jobname = NULL;
     int ret = -1;
     virDomainDiskDef *disk = NULL;
     virStorageSource *topSource;
     virStorageSource *baseSource = NULL;
     virStorageSource *top_parent = NULL;
     bool clean_access = false;
-    g_autofree char *topPath = NULL;
-    g_autofree char *basePath = NULL;
     g_autofree char *backingPath = NULL;
     unsigned long long speed = bandwidth;
     qemuBlockJobData *job = NULL;
     g_autoptr(virStorageSource) mirror = NULL;
-    const char *nodetop = NULL;
-    const char *nodebase = NULL;
-    bool persistjob = false;
-    bool blockdev = false;

     virCheckFlags(VIR_DOMAIN_BLOCK_COMMIT_SHALLOW |
                   VIR_DOMAIN_BLOCK_COMMIT_ACTIVE |
@@ -15507,8 +15499,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
-
     /* Convert bandwidth MiB to bytes, if necessary */
     if (!(flags & VIR_DOMAIN_BLOCK_COMMIT_BANDWIDTH_BYTES)) {
         if (speed > LLONG_MAX >> 20) {
@@ -15539,12 +15529,6 @@ qemuDomainBlockCommit(virDomainPtr dom,
     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 (!(topSource = virStorageSourceChainLookup(disk->src, NULL, top,
@@ -15600,7 +15584,7 @@ qemuDomainBlockCommit(virDomainPtr dom,

     if (flags & VIR_DOMAIN_BLOCK_COMMIT_RELATIVE &&
         topSource != disk->src) {
-        if (blockdev && top_parent &&
+        if (top_parent &&
             qemuBlockUpdateRelativeBacking(vm, top_parent, disk->src) < 0)
             goto endjob;

@@ -15644,39 +15628,21 @@ qemuDomainBlockCommit(virDomainPtr dom,

     disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;

-    /* Start the commit operation.  Pass the user's original spelling,
-     * if any, through to qemu, since qemu may behave differently
-     * depending on whether the input was specified as relative or
-     * absolute (that is, our absolute top_canon may do the wrong
-     * thing if the user specified a relative name).  */
-
-    if (blockdev) {
-        persistjob = true;
-        jobname = job->name;
-        nodetop = topSource->nodeformat;
-        nodebase = baseSource->nodeformat;
-        device = qemuDomainDiskGetTopNodename(disk);
-        if (!backingPath && top_parent &&
-            !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
-            goto endjob;
-
-    } else {
-        device = job->name;
-    }
+    if (!backingPath && top_parent &&
+        !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
+        goto endjob;

     qemuDomainObjEnterMonitor(driver, vm);

-    if (!blockdev) {
-        basePath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src,
-                                             baseSource);
-        topPath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src,
-                                            topSource);
-    }
-
-    if (blockdev || (basePath && topPath))
-        ret = qemuMonitorBlockCommit(priv->mon, device, jobname, persistjob,
-                                     topPath, nodetop, basePath, nodebase,
-                                     backingPath, speed);
+    ret = qemuMonitorBlockCommit(priv->mon,
+                                 qemuDomainDiskGetTopNodename(disk),
+                                 job->name,
+                                 true,
+                                 NULL,
+                                 topSource->nodeformat,
+                                 NULL,
+                                 baseSource->nodeformat,
+                                 backingPath, speed);

     qemuDomainObjExitMonitor(vm);

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:25 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:25 +0200
Subject: [PATCH 47/80] qemu: monitor: Remove unused qemuMonitorDiskNameLookup
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <010508d3109ca554a47edc6bb643ced5e8d01505.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 14 -------
 src/qemu/qemu_monitor.h      |  5 ---
 src/qemu/qemu_monitor_json.c | 77 ------------------------------------
 src/qemu/qemu_monitor_json.h |  8 ----
 4 files changed, 104 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 15fe6690e9..f7dade5d79 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2929,20 +2929,6 @@ qemuMonitorBlockCommit(qemuMonitor *mon,
 }


-/* Determine the name that qemu is using for tracking the backing
- * element TARGET within the chain starting at TOP.  */
-char *
-qemuMonitorDiskNameLookup(qemuMonitor *mon,
-                          const char *device,
-                          virStorageSource *top,
-                          virStorageSource *target)
-{
-    QEMU_CHECK_MONITOR_NULL(mon);
-
-    return qemuMonitorJSONDiskNameLookup(mon, device, top, target);
-}
-
-
 /* Use the block-job-complete monitor command to pivot a block copy job.  */
 int
 qemuMonitorDrivePivot(qemuMonitor *mon,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 89b2348775..7374192da2 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1002,11 +1002,6 @@ int qemuMonitorBlockCommit(qemuMonitor *mon,
                            const char *backingName,
                            unsigned long long bandwidth)
     ATTRIBUTE_NONNULL(2);
-char *qemuMonitorDiskNameLookup(qemuMonitor *mon,
-                                const char *device,
-                                virStorageSource *top,
-                                virStorageSource *target)
-    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);

 int qemuMonitorArbitraryCommand(qemuMonitor *mon,
                                 const char *cmd,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index e569cf27be..7b6be69aa7 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4208,83 +4208,6 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon,
     return 0;
 }

-
-static char *
-qemuMonitorJSONDiskNameLookupOne(virJSONValue *image,
-                                 virStorageSource *top,
-                                 virStorageSource *target)
-{
-    virJSONValue *backing;
-    char *ret;
-
-    /* The caller will report a generic message if we return NULL
-     * without an error; but in some cases we can improve by reporting
-     * a more specific message.  */
-    if (!top || !image)
-        return NULL;
-    if (top != target) {
-        backing = virJSONValueObjectGetObject(image, "backing-image");
-        return qemuMonitorJSONDiskNameLookupOne(backing, top->backingStore,
-                                                target);
-    }
-    ret = g_strdup(virJSONValueObjectGetString(image, "filename"));
-    /* Sanity check - the name qemu gave us should resolve to the same
-       file tracked by our target description. */
-    if (virStorageSourceIsLocalStorage(target) &&
-        STRNEQ(ret, target->path) &&
-        !virFileLinkPointsTo(ret, target->path)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("qemu block name '%s' doesn't match expected '%s'"),
-                       ret, target->path);
-        VIR_FREE(ret);
-    }
-    return ret;
-}
-
-
-char *
-qemuMonitorJSONDiskNameLookup(qemuMonitor *mon,
-                              const char *device,
-                              virStorageSource *top,
-                              virStorageSource *target)
-{
-    g_autoptr(virJSONValue) devices = NULL;
-    size_t i;
-
-    if (!(devices = qemuMonitorJSONQueryBlock(mon)))
-        return NULL;
-
-    for (i = 0; i < virJSONValueArraySize(devices); i++) {
-        virJSONValue *dev;
-        virJSONValue *inserted;
-        virJSONValue *image;
-        const char *thisdev;
-
-        if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
-            return NULL;
-
-        if (!(thisdev = qemuMonitorJSONGetBlockDevDevice(dev)))
-            return NULL;
-
-        if (STREQ(thisdev, device)) {
-            if ((inserted = virJSONValueObjectGetObject(dev, "inserted")) &&
-                (image = virJSONValueObjectGetObject(inserted, "image"))) {
-                return qemuMonitorJSONDiskNameLookupOne(image, top, target);
-            }
-        }
-    }
-    /* Guarantee an error when returning NULL, but don't override a
-     * more specific error if one was already generated.  */
-    if (virGetLastErrorCode() == VIR_ERR_OK) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unable to find backing name for device %s"),
-                       device);
-    }
-
-    return NULL;
-}
-
-
 int qemuMonitorJSONArbitraryCommand(qemuMonitor *mon,
                                     const char *cmd_str,
                                     int fd,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 4f780e02aa..9a0bed0355 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -334,14 +334,6 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon,
                            unsigned long long bandwidth)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);

-char *
-qemuMonitorJSONDiskNameLookup(qemuMonitor *mon,
-                              const char *device,
-                              virStorageSource *top,
-                              virStorageSource *target)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    ATTRIBUTE_NONNULL(4);
-
 int
 qemuMonitorJSONArbitraryCommand(qemuMonitor *mon,
                                 const char *cmd_str,
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:19 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:19 +0200
Subject: [PATCH 41/80] qemu: driver: Remove pre-blockdev code paths from
 qemuDomainBlockCopyCommon
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <0deae3a05b519d8e883539a4e62701646a16ff75.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 171 ++++++++++++++++-------------------------
 1 file changed, 66 insertions(+), 105 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 811b4a610c..bae9558cfd 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14943,8 +14943,7 @@ qemuDomainBlockCopyValidateMirror(virStorageSource *mirror,
  */
 static int
 qemuDomainBlockCopyCommonValidateUserMirrorBackingStore(virStorageSource *mirror,
-                                                        bool shallow,
-                                                        bool blockdev)
+                                                        bool shallow)
 {
     if (!virStorageSourceHasBacking(mirror)) {
         /* for deep copy there won't be backing chain so we can terminate it */
@@ -14960,12 +14959,6 @@ qemuDomainBlockCopyCommonValidateUserMirrorBackingStore(virStorageSource *mirror
          * For a copy when we are not reusing external image requesting shallow
          * is okay and will inherit the original backing chain */
     } else {
-        if (!blockdev) {
-            virReportError(VIR_ERR_INVALID_ARG, "%s",
-                           _("backingStore of mirror target is not supported by this qemu"));
-            return -1;
-        }
-
         if (!shallow) {
             virReportError(VIR_ERR_INVALID_ARG, "%s",
                            _("backingStore of mirror without VIR_DOMAIN_BLOCK_COPY_SHALLOW doesn't make sense"));
@@ -15000,13 +14993,11 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     bool need_unlink = false;
     bool need_revoke = false;
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-    const char *format = NULL;
     bool mirror_reuse = !!(flags & VIR_DOMAIN_BLOCK_COPY_REUSE_EXT);
     bool mirror_shallow = !!(flags & VIR_DOMAIN_BLOCK_COPY_SHALLOW);
     bool existing = mirror_reuse;
     qemuBlockJobData *job = NULL;
     g_autoptr(virStorageSource) mirror = mirrorsrc;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     bool supports_create = false;
     bool supports_access = false;
     bool supports_detect = false;
@@ -15060,12 +15051,6 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
         virDomainDiskDefSourceLUNValidate(mirror) < 0)
         goto endjob;

-    if (syncWrites && !blockdev) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("VIR_DOMAIN_BLOCK_COPY_SYNCHRONOUS_WRITES is not supported by this VM"));
-        goto endjob;
-    }
-
     if (!(flags & VIR_DOMAIN_BLOCK_COPY_TRANSIENT_JOB) &&
         vm->persistent) {
         /* XXX if qemu ever lets us start a new domain with mirroring
@@ -15084,8 +15069,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     }

     if (qemuDomainBlockCopyCommonValidateUserMirrorBackingStore(mirror,
-                                                                mirror_shallow,
-                                                                blockdev) < 0)
+                                                                mirror_shallow) < 0)
         goto endjob;

     /* unless the user provides a pre-created file, shallow copy into a raw
@@ -15098,14 +15082,6 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
         goto endjob;
     }

-    /* Prepare the destination file.  */
-    if (!blockdev &&
-        !virStorageSourceIsLocalStorage(mirror)) {
-        virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
-                       _("non-file destination not supported yet"));
-        goto endjob;
-    }
-
     supports_access = virStorageSourceSupportsAccess(mirror) == 1;
     supports_create = virStorageSourceSupportsCreate(mirror) == 1;
     supports_detect = virStorageSourceSupportsBackingChainTraversal(mirror) == 1;
@@ -15148,8 +15124,8 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
         goto endjob;
     }

-    /* pre-create the image file. In case when 'blockdev' is used this is
-     * required so that libvirt can properly label the image for access by qemu */
+    /* pre-create the image file. This is required so that libvirt can properly
+     * label the image for access by qemu */
     if (!existing) {
         if (supports_create) {
             if (virStorageSourceCreate(mirror) < 0) {
@@ -15161,9 +15137,6 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
         }
     }

-    if (mirror->format > 0)
-        format = virStorageFileFormatTypeToString(mirror->format);
-
     if (virStorageSourceInitChainElement(mirror, disk->src,
                                          keepParentLabel) < 0)
         goto endjob;
@@ -15179,21 +15152,19 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,

     /* we must initialize XML-provided chain prior to detecting to keep semantics
      * with VM startup */
-    if (blockdev) {
-        for (n = mirror; virStorageSourceIsBacking(n); n = n->backingStore) {
-            if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0)
-                goto endjob;
-        }
-
-        /* 'qemuDomainPrepareStorageSourceBlockdev' calls
-         * 'qemuDomainPrepareDiskSourceData' which propagates 'detect_zeroes'
-         * into the topmost virStorage source of the disk chain.
-         * Since 'mirror' has the ambition to replace it we need to propagate
-         * it into the mirror too. We do it directly as otherwise we'd need
-         * to modify all callers of 'qemuDomainPrepareStorageSourceBlockdev' */
-        mirror->detect_zeroes = disk->detect_zeroes;
+    for (n = mirror; virStorageSourceIsBacking(n); n = n->backingStore) {
+        if (qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0)
+            goto endjob;
     }

+    /* 'qemuDomainPrepareStorageSourceBlockdev' calls
+     * 'qemuDomainPrepareDiskSourceData' which propagates 'detect_zeroes'
+     * into the topmost virStorage source of the disk chain.
+     * Since 'mirror' has the ambition to replace it we need to propagate
+     * it into the mirror too. We do it directly as otherwise we'd need
+     * to modify all callers of 'qemuDomainPrepareStorageSourceBlockdev' */
+    mirror->detect_zeroes = disk->detect_zeroes;
+
     /* If reusing an external image that includes a backing file but the user
      * did not enumerate the chain in the XML we need to detect the chain */
     if (mirror_reuse &&
@@ -15206,67 +15177,65 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
         goto endjob;
     need_revoke = true;

-    if (blockdev) {
-        if (mirror_reuse) {
-            /* 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 (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
-                                                                                 terminator)))
-                    goto endjob;
-            } else {
-                if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror)))
-                    goto endjob;
-            }
+    if (mirror_reuse) {
+        /* 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 (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
+                                                                             terminator)))
+                goto endjob;
         } else {
-            if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, VIR_ASYNC_JOB_NONE)))
+            if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror)))
                 goto endjob;
+        }
+    } else {
+        if (!(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, VIR_ASYNC_JOB_NONE)))
+            goto endjob;

-            if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData,
-                                                       mirror, disk->src))
-                goto endjob;
+        if (qemuBlockStorageSourceCreateDetectSize(blockNamedNodeData,
+                                                   mirror, disk->src))
+            goto endjob;
+
+        if (mirror_shallow) {
+            /* if external backing store is populated we'll need to open it */
+            if (virStorageSourceHasBacking(mirror)) {
+                if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror->backingStore)))
+                    goto endjob;

-            if (mirror_shallow) {
-                /* if external backing store is populated we'll need to open it */
-                if (virStorageSourceHasBacking(mirror)) {
-                    if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(mirror->backingStore)))
-                        goto endjob;
-
-                    mirrorBacking = mirror->backingStore;
-                } else {
-                    /* backing store of original image will be reused, but the
-                     * new image must refer to it in the metadata */
-                    mirrorBacking = disk->src->backingStore;
-                }
-            } else {
                 mirrorBacking = mirror->backingStore;
+            } else {
+                /* backing store of original image will be reused, but the
+                 * new image must refer to it in the metadata */
+                mirrorBacking = disk->src->backingStore;
             }
-
-            if (!(crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
-                                                                               mirrorBacking)))
-                goto endjob;
+        } else {
+            mirrorBacking = mirror->backingStore;
         }

-        if (data) {
-            qemuDomainObjEnterMonitor(driver, vm);
-            rc = qemuBlockStorageSourceChainAttach(priv->mon, data);
-            qemuDomainObjExitMonitor(vm);
+        if (!(crdata = qemuBuildStorageSourceChainAttachPrepareBlockdevTop(mirror,
+                                                                           mirrorBacking)))
+            goto endjob;
+    }

-            if (rc < 0)
-                goto endjob;
-        }
+    if (data) {
+        qemuDomainObjEnterMonitor(driver, vm);
+        rc = qemuBlockStorageSourceChainAttach(priv->mon, data);
+        qemuDomainObjExitMonitor(vm);

-        if (crdata &&
-            qemuBlockStorageSourceCreate(vm, mirror, mirrorBacking, mirror->backingStore,
-                                         crdata->srcdata[0], VIR_ASYNC_JOB_NONE) < 0)
+        if (rc < 0)
             goto endjob;
     }

+    if (crdata &&
+        qemuBlockStorageSourceCreate(vm, mirror, mirrorBacking, mirror->backingStore,
+                                     crdata->srcdata[0], VIR_ASYNC_JOB_NONE) < 0)
+        goto endjob;
+
     if (!(job = qemuBlockJobDiskNewCopy(vm, disk, mirror, mirror_shallow, mirror_reuse, flags)))
         goto endjob;

@@ -15275,19 +15244,11 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     /* Actually start the mirroring */
     qemuDomainObjEnterMonitor(driver, vm);

-    if (blockdev) {
-        ret = qemuMonitorBlockdevMirror(priv->mon, job->name, true,
-                                        qemuDomainDiskGetTopNodename(disk),
-                                        mirror->nodeformat, bandwidth,
-                                        granularity, buf_size, mirror_shallow,
-                                        syncWrites);
-    } else {
-        /* qemuMonitorDriveMirror needs to honor the REUSE_EXT flag as specified
-         * by the user */
-        ret = qemuMonitorDriveMirror(priv->mon, job->name, mirror->path, format,
-                                     bandwidth, granularity, buf_size,
-                                     mirror_shallow, mirror_reuse);
-    }
+    ret = qemuMonitorBlockdevMirror(priv->mon, job->name, true,
+                                    qemuDomainDiskGetTopNodename(disk),
+                                    mirror->nodeformat, bandwidth,
+                                    granularity, buf_size, mirror_shallow,
+                                    syncWrites);

     virDomainAuditDisk(vm, NULL, mirror, "mirror", ret >= 0);
     qemuDomainObjExitMonitor(vm);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:22 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:22 +0200
Subject: [PATCH 44/80] qemu: monitor: Remove unused arguments of
 qemuMonitorBlockCommit
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <05fe72e0e1de329666e2f41e07391b01d1ac65ec.1658843187.git.pkrempa@redhat.com>

The 'persistjob' is always true and 'top' and 'base' are always NULL.
Adjust the functions to drop the arguments.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c       |  3 ---
 src/qemu/qemu_monitor.c      | 15 +++++----------
 src/qemu/qemu_monitor.h      |  3 ---
 src/qemu/qemu_monitor_json.c | 14 ++------------
 src/qemu/qemu_monitor_json.h |  3 ---
 tests/qemumonitorjsontest.c  |  2 +-
 6 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index e8dc524186..ac20d04353 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15637,10 +15637,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
     ret = qemuMonitorBlockCommit(priv->mon,
                                  qemuDomainDiskGetTopNodename(disk),
                                  job->name,
-                                 true,
-                                 NULL,
                                  topSource->nodeformat,
-                                 NULL,
                                  baseSource->nodeformat,
                                  backingPath, speed);

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 9c24b842bd..1453181f94 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2913,24 +2913,19 @@ int
 qemuMonitorBlockCommit(qemuMonitor *mon,
                        const char *device,
                        const char *jobname,
-                       bool persistjob,
-                       const char *top,
                        const char *topNode,
-                       const char *base,
                        const char *baseNode,
                        const char *backingName,
                        unsigned long long bandwidth)
 {
-    VIR_DEBUG("device=%s, jobname=%s, persistjob=%d, top=%s, topNode=%s, "
-              "base=%s, baseNode=%s, backingName=%s, bandwidth=%llu",
-              device, NULLSTR(jobname), persistjob, NULLSTR(top), NULLSTR(topNode),
-              NULLSTR(base), NULLSTR(baseNode), NULLSTR(backingName), bandwidth);
+    VIR_DEBUG("device=%s, jobname=%s, topNode=%s, baseNode=%s, backingName=%s, bandwidth=%llu",
+              device, NULLSTR(jobname), NULLSTR(topNode),
+              NULLSTR(baseNode), NULLSTR(backingName), bandwidth);

     QEMU_CHECK_MONITOR(mon);

-    return qemuMonitorJSONBlockCommit(mon, device, jobname, persistjob, top,
-                                      topNode, base, baseNode, backingName,
-                                      bandwidth);
+    return qemuMonitorJSONBlockCommit(mon, device, jobname, topNode, baseNode,
+                                      backingName, bandwidth);
 }


diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index aee9ca0e6a..7aed4ffd4f 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -997,10 +997,7 @@ int qemuMonitorDrivePivot(qemuMonitor *mon,
 int qemuMonitorBlockCommit(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *top,
                            const char *topNode,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long bandwidth)
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index bd3130075b..e6eb41d85b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4176,31 +4176,21 @@ int
 qemuMonitorJSONBlockCommit(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *top,
                            const char *topNode,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long speed)
 {
     g_autoptr(virJSONValue) cmd = NULL;
     g_autoptr(virJSONValue) reply = NULL;
-    virTristateBool autofinalize = VIR_TRISTATE_BOOL_ABSENT;
-    virTristateBool autodismiss = VIR_TRISTATE_BOOL_ABSENT;
-
-    if (persistjob) {
-        autofinalize = VIR_TRISTATE_BOOL_YES;
-        autodismiss = VIR_TRISTATE_BOOL_NO;
-    }
+    virTristateBool autofinalize = VIR_TRISTATE_BOOL_YES;
+    virTristateBool autodismiss = VIR_TRISTATE_BOOL_NO;

     cmd = qemuMonitorJSONMakeCommand("block-commit",
                                      "s:device", device,
                                      "S:job-id", jobname,
                                      "Y:speed", speed,
-                                     "S:top", top,
                                      "S:top-node", topNode,
-                                     "S:base", base,
                                      "S:base-node", baseNode,
                                      "S:backing-file", backingName,
                                      "T:auto-finalize", autofinalize,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index f409480c0b..9da26ca646 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -328,10 +328,7 @@ int
 qemuMonitorJSONBlockCommit(qemuMonitor *mon,
                            const char *device,
                            const char *jobname,
-                           bool persistjob,
-                           const char *top,
                            const char *topNode,
-                           const char *base,
                            const char *baseNode,
                            const char *backingName,
                            unsigned long long bandwidth)
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 265fa0b705..d5915720c8 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1215,7 +1215,7 @@ GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
 GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", true, "/foo/bar1", "backingnode", "backingfilename", 1024)
-GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", true, "/foo/bar1", "topnode", "/foo/bar2", "basenode", "backingfilename", 1024)
+GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
 GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar")
 GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd", false)
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:23 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:23 +0200
Subject: [PATCH 45/80] qemu: driver: Remove pre-blockdev code paths from
 qemuDomainBlockPullCommon
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <e5711f6b2af275e68c235e64d0ffc2e954b0ca65.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ac20d04353..7a2d8dde5e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14466,17 +14466,12 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
 {
     qemuDomainObjPrivate *priv = vm->privateData;
     virQEMUDriver *driver = priv->driver;
-    const char *device = NULL;
-    const char *jobname = NULL;
     virDomainDiskDef *disk;
     virStorageSource *baseSource = NULL;
-    g_autofree char *basePath = NULL;
     g_autofree char *backingPath = NULL;
     unsigned long long speed = bandwidth;
     qemuBlockJobData *job = NULL;
-    bool persistjob = false;
     const char *nodebase = NULL;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     int ret = -1;

     if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE && !base) {
@@ -14511,8 +14506,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm,

     if (baseSource) {
         if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) {
-            if (blockdev &&
-                qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
+            if (qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0)
                 goto endjob;

             if (virStorageSourceGetRelativeBackingPath(disk->src->backingStore,
@@ -14542,29 +14536,22 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
     if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource, flags)))
         goto endjob;

-    if (blockdev) {
-        jobname = job->name;
-        persistjob = true;
-        if (baseSource) {
-            nodebase = baseSource->nodeformat;
-            if (!backingPath &&
-                !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
-                goto endjob;
-        }
-        device = disk->src->nodeformat;
-    } else {
-        device = job->name;
+    if (baseSource) {
+        nodebase = baseSource->nodeformat;
+        if (!backingPath &&
+            !(backingPath = qemuBlockGetBackingStoreString(baseSource, false)))
+            goto endjob;
     }

     qemuDomainObjEnterMonitor(driver, vm);
-    if (!blockdev && baseSource)
-        basePath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src,
-                                             baseSource);
-
-    if (blockdev ||
-        (!baseSource || basePath))
-        ret = qemuMonitorBlockStream(priv->mon, device, jobname, persistjob, basePath,
-                                     nodebase, backingPath, speed);
+    ret = qemuMonitorBlockStream(priv->mon,
+                                 disk->src->nodeformat,
+                                 job->name,
+                                 true,
+                                 NULL,
+                                 nodebase,
+                                 backingPath,
+                                 speed);
     qemuDomainObjExitMonitor(vm);

     if (ret < 0)
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:27 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:27 +0200
Subject: [PATCH 49/80] qemu: monitor: Remove unused qemuMonitorDrivePivot
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <a6cbeb05c6364fe12671ba5077ee2e15eea3792d.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 13 -------------
 src/qemu/qemu_monitor.h      |  3 ---
 src/qemu/qemu_monitor_json.c | 23 -----------------------
 src/qemu/qemu_monitor_json.h |  5 -----
 tests/qemumonitorjsontest.c  |  2 --
 5 files changed, 46 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f7dade5d79..5e71945831 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2929,19 +2929,6 @@ qemuMonitorBlockCommit(qemuMonitor *mon,
 }


-/* Use the block-job-complete monitor command to pivot a block copy job.  */
-int
-qemuMonitorDrivePivot(qemuMonitor *mon,
-                      const char *jobname)
-{
-    VIR_DEBUG("jobname=%s", jobname);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONDrivePivot(mon, jobname);
-}
-
-
 int
 qemuMonitorArbitraryCommand(qemuMonitor *mon,
                             const char *cmd,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 7374192da2..24a33b9b29 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -990,9 +990,6 @@ int qemuMonitorBlockdevMirror(qemuMonitor *mon,
                               bool shallow,
                               bool syncWrite)
     ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5);
-int qemuMonitorDrivePivot(qemuMonitor *mon,
-                          const char *jobname)
-    ATTRIBUTE_NONNULL(2);

 int qemuMonitorBlockCommit(qemuMonitor *mon,
                            const char *device,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7b6be69aa7..85a36ff68b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4532,29 +4532,6 @@ qemuMonitorJSONBlockJobSetSpeed(qemuMonitor *mon,
 }


-int
-qemuMonitorJSONDrivePivot(qemuMonitor *mon,
-                          const char *jobname)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("block-job-complete",
-                                     "s:device", jobname,
-                                     NULL);
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONBlockJobError(cmd, reply, jobname) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 int
 qemuMonitorJSONJobDismiss(qemuMonitor *mon,
                           const char *jobname)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 9a0bed0355..c5716dfe3e 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -319,11 +319,6 @@ qemuMonitorJSONBlockdevMirror(qemuMonitor *mon,
                               bool syncWrite)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5);

-int
-qemuMonitorJSONDrivePivot(qemuMonitor *mon,
-                          const char *jobname)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
-
 int
 qemuMonitorJSONBlockCommit(qemuMonitor *mon,
                            const char *device,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index f1c403d5b3..ced288cf5a 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1216,7 +1216,6 @@ GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
 GEN_TEST_FUNC(qemuMonitorJSONBlockdevMirror, "jobname", true, "vdb", "targetnode", 1024, 1234, 31234, true, true)
 GEN_TEST_FUNC(qemuMonitorJSONBlockStream, "vdb", "jobname", "backingnode", "backingfilename", 1024)
 GEN_TEST_FUNC(qemuMonitorJSONBlockCommit, "vdb", "jobname", "topnode", "basenode", "backingfilename", 1024)
-GEN_TEST_FUNC(qemuMonitorJSONDrivePivot, "vdb")
 GEN_TEST_FUNC(qemuMonitorJSONScreendump, "devicename", 1, "/foo/bar")
 GEN_TEST_FUNC(qemuMonitorJSONOpenGraphics, "spice", "spicefd", false)
 GEN_TEST_FUNC(qemuMonitorJSONNBDServerAdd, "vda", "export", true, "bitmap")
@@ -3003,7 +3002,6 @@ mymain(void)
     DO_TEST_GEN(qemuMonitorJSONBlockdevMirror);
     DO_TEST_GEN(qemuMonitorJSONBlockStream);
     DO_TEST_GEN(qemuMonitorJSONBlockCommit);
-    DO_TEST_GEN(qemuMonitorJSONDrivePivot);
     DO_TEST_GEN(qemuMonitorJSONScreendump);
     DO_TEST_GEN(qemuMonitorJSONOpenGraphics);
     DO_TEST_GEN_DEPRECATED(qemuMonitorJSONNBDServerAdd, true);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:28 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:28 +0200
Subject: [PATCH 50/80] qemu: command: Remove pre-blockdev floppy setup
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <52f0e871e3e9a775f06c70ec820adc9914ba5b70.1658843187.git.pkrempa@redhat.com>

With new qemu versions we setup floppies via -device.

Some legacy output tests were not modernized yet so the expected output
needs to be adjusted.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 50 +++--------------------------------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index e0c5e15a63..5c90138c73 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2361,25 +2361,13 @@ qemuCommandAddExtDevice(virCommand *cmd,
 static void
 qemuBuildFloppyCommandLineControllerOptionsImplicit(virCommand *cmd,
                                                     unsigned int bootindexA,
-                                                    unsigned int bootindexB,
-                                                    const char *backendA,
-                                                    const char *backendB)
+                                                    unsigned int bootindexB)
 {
-    if (backendA) {
-        virCommandAddArg(cmd, "-global");
-        virCommandAddArgFormat(cmd, "isa-fdc.driveA=%s", backendA);
-    }
-
     if (bootindexA > 0) {
         virCommandAddArg(cmd, "-global");
         virCommandAddArgFormat(cmd, "isa-fdc.bootindexA=%u", bootindexA);
     }

-    if (backendB) {
-        virCommandAddArg(cmd, "-global");
-        virCommandAddArgFormat(cmd, "isa-fdc.driveB=%s", backendB);
-    }
-
     if (bootindexB > 0) {
         virCommandAddArg(cmd, "-global");
         virCommandAddArgFormat(cmd, "isa-fdc.bootindexB=%u", bootindexB);
@@ -2391,8 +2379,6 @@ static int
 qemuBuildFloppyCommandLineControllerOptionsExplicit(virCommand *cmd,
                                                     unsigned int bootindexA,
                                                     unsigned int bootindexB,
-                                                    const char *backendA,
-                                                    const char *backendB,
                                                     const virDomainDef *def,
                                                     virQEMUCaps *qemuCaps)
 {
@@ -2400,9 +2386,7 @@ qemuBuildFloppyCommandLineControllerOptionsExplicit(virCommand *cmd,

     if (virJSONValueObjectAdd(&props,
                               "s:driver", "isa-fdc",
-                              "S:driveA", backendA,
                               "p:bootindexA", bootindexA,
-                              "S:driveB", backendB,
                               "p:bootindexB", bootindexB,
                               NULL) < 0)
         return -1;
@@ -2421,13 +2405,10 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd,
 {
     unsigned int bootindexA = 0;
     unsigned int bootindexB = 0;
-    g_autofree char *backendA = NULL;
-    g_autofree char *backendB = NULL;
     bool hasfloppy = false;
     size_t i;

     for (i = 0; i < def->ndisks; i++) {
-        g_autofree char *backendAlias = NULL;
         virDomainDiskDef *disk = def->disks[i];

         if (disk->bus != VIR_DOMAIN_DISK_BUS_FDC)
@@ -2435,17 +2416,10 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd,

         hasfloppy = true;

-        /* with -blockdev we setup the floppy device and it's backend with -device */
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-            qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0)
-            return -1;
-
         if (disk->info.addr.drive.unit) {
             bootindexB = disk->info.effectiveBootIndex;
-            backendB = g_steal_pointer(&backendAlias);
         } else {
             bootindexA = disk->info.effectiveBootIndex;
-            backendA = g_steal_pointer(&backendAlias);
         }
     }

@@ -2456,17 +2430,13 @@ qemuBuildFloppyCommandLineControllerOptions(virCommand *cmd,
         if (qemuBuildFloppyCommandLineControllerOptionsExplicit(cmd,
                                                                 bootindexA,
                                                                 bootindexB,
-                                                                backendA,
-                                                                backendB,
                                                                 def,
                                                                 qemuCaps) < 0)
             return -1;
     } else {
         qemuBuildFloppyCommandLineControllerOptionsImplicit(cmd,
                                                             bootindexA,
-                                                            bootindexB,
-                                                            backendA,
-                                                            backendB);
+                                                            bootindexB);
     }

     return 0;
@@ -2602,12 +2572,6 @@ qemuBuildDiskCommandLine(virCommand *cmd,
     if (qemuDiskBusIsSD(disk->bus))
         return 0;

-    /* floppy devices are instantiated via -drive ...,if=none and bound to the
-     * controller via -global isa-fdc.driveA/B options in the pre-blockdev era */
-    if (disk->bus == VIR_DOMAIN_DISK_BUS_FDC &&
-        !virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return 0;
-
     if (qemuCommandAddExtDevice(cmd, &disk->info, def, qemuCaps) < 0)
         return -1;

@@ -2627,12 +2591,8 @@ qemuBuildDisksCommandLine(virCommand *cmd,
                           virQEMUCaps *qemuCaps)
 {
     size_t i;
-    bool blockdev = virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV);

-    /* If we want to express the floppy drives via -device, the controller needs
-     * to be instantiated prior to that */
-    if (blockdev &&
-        qemuBuildFloppyCommandLineControllerOptions(cmd, def, qemuCaps) < 0)
+    if (qemuBuildFloppyCommandLineControllerOptions(cmd, def, qemuCaps) < 0)
         return -1;

     for (i = 0; i < def->ndisks; i++) {
@@ -2648,10 +2608,6 @@ qemuBuildDisksCommandLine(virCommand *cmd,
             return -1;
     }

-    if (!blockdev &&
-        qemuBuildFloppyCommandLineControllerOptions(cmd, def, qemuCaps) < 0)
-        return -1;
-
     return 0;
 }

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:29 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:29 +0200
Subject: [PATCH 51/80] qemu: Remove pre-blockdev PFLASH setup
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <cc5252472924e8cb5c4bb88e1a26b9083659bb51.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 60 +++++++----------------------------------
 src/qemu/qemu_domain.c  |  5 +---
 2 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5c90138c73..ed718eb81b 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7045,8 +7045,7 @@ qemuBuildMachineCommandLine(virCommand *cmd,
         }
     }

-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        virDomainDefHasOldStyleUEFI(def)) {
+    if (virDomainDefHasOldStyleUEFI(def)) {
         if (priv->pflash0)
             virBufferAsprintf(&buf, ",pflash0=%s", priv->pflash0->nodeformat);
         if (def->os.loader->nvram)
@@ -9364,53 +9363,10 @@ qemuBuildRedirdevCommandLine(virCommand *cmd,
 }


-static void
-qemuBuildDomainLoaderPflashCommandLine(virCommand *cmd,
-                                      virDomainLoaderDef *loader,
-                                      virQEMUCaps *qemuCaps)
-{
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    int unit = 0;
-
-    if (loader->secure == VIR_TRISTATE_BOOL_YES) {
-        virCommandAddArgList(cmd,
-                             "-global",
-                             "driver=cfi.pflash01,property=secure,value=on",
-                             NULL);
-    }
-
-    /* with blockdev we instantiate the pflash when formatting -machine */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return;
-
-    virBufferAddLit(&buf, "file=");
-    virQEMUBuildBufferEscapeComma(&buf, loader->path);
-    virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit);
-    unit++;
-
-    if (loader->readonly) {
-        virBufferAsprintf(&buf, ",readonly=%s",
-                          virTristateSwitchTypeToString(loader->readonly));
-    }
-
-    virCommandAddArg(cmd, "-drive");
-    virCommandAddArgBuffer(cmd, &buf);
-
-    if (loader->nvram) {
-        virBufferAddLit(&buf, "file=");
-        virQEMUBuildBufferEscapeComma(&buf, loader->nvram->path);
-        virBufferAsprintf(&buf, ",if=pflash,format=raw,unit=%d", unit);
-
-        virCommandAddArg(cmd, "-drive");
-        virCommandAddArgBuffer(cmd, &buf);
-    }
-}
-

 static void
 qemuBuildDomainLoaderCommandLine(virCommand *cmd,
-                                 virDomainDef *def,
-                                 virQEMUCaps *qemuCaps)
+                                 virDomainDef *def)
 {
     virDomainLoaderDef *loader = def->os.loader;

@@ -9424,7 +9380,12 @@ qemuBuildDomainLoaderCommandLine(virCommand *cmd,
         break;

     case VIR_DOMAIN_LOADER_TYPE_PFLASH:
-        qemuBuildDomainLoaderPflashCommandLine(cmd, loader, qemuCaps);
+        if (loader->secure == VIR_TRISTATE_BOOL_YES) {
+            virCommandAddArgList(cmd,
+                                 "-global",
+                                 "driver=cfi.pflash01,property=secure,value=on",
+                                 NULL);
+        }
         break;

     case VIR_DOMAIN_LOADER_TYPE_NONE:
@@ -9859,9 +9820,6 @@ qemuBuildPflashBlockdevCommandLine(virCommand *cmd,
     if (!virDomainDefHasOldStyleUEFI(vm->def))
         return 0;

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return 0;
-
     if (priv->pflash0 &&
         qemuBuildPflashBlockdevOne(cmd, priv->pflash0, priv->qemuCaps) < 0)
         return -1;
@@ -10267,7 +10225,7 @@ qemuBuildCommandLine(virDomainObj *vm,
     if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0)
         return NULL;

-    qemuBuildDomainLoaderCommandLine(cmd, def, qemuCaps);
+    qemuBuildDomainLoaderCommandLine(cmd, def);

     if (qemuBuildMemCommandLine(cmd, def, qemuCaps, priv) < 0)
         return NULL;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 7403b2584b..8b55dd0361 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11305,7 +11305,7 @@ qemuDomainSupportsCheckpointsBlockjobs(virDomainObj *vm)
  * qemuDomainInitializePflashStorageSource:
  *
  * This helper converts the specification of the source of the 'loader' in case
- * PFLASH is required to virStorageSources in case QEMU_CAPS_BLOCKDEV is present.
+ * PFLASH is required to virStorageSources.
  *
  * This helper is used in the intermediate state when we don't support full
  * backing chains for pflash drives in the XML.
@@ -11323,9 +11323,6 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
     virDomainDef *def = vm->def;
     g_autoptr(virStorageSource) pflash0 = NULL;

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        return 0;
-
     if (!virDomainDefHasOldStyleUEFI(def))
         return 0;

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:34 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:34 +0200
Subject: [PATCH 56/80] qemu: hotplug: Remove pre-blockdev code path from
 qemuDomainChangeEjectableMedia
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <0ff0dfb651d4a9947f8c23c2a59067404fc62c4a.1658843187.git.pkrempa@redhat.com>

All media are changed in blockdev-instantiated cdroms now, remove the
old code.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_hotplug.c | 88 +----------------------------------------
 1 file changed, 1 insertion(+), 87 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 28e4284e62..a57db12144 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -269,89 +269,6 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm,
 }


-/**
- * qemuDomainChangeMediaLegacy:
- * @driver: qemu driver structure
- * @vm: domain definition
- * @disk: disk definition to change the source of
- * @newsrc: new disk source to change to
- * @force: force the change of media
- *
- * Change the media in an ejectable device to the one described by
- * @newsrc. This function also removes the old source from the
- * shared device table if appropriate. Note that newsrc is consumed
- * on success and the old source is freed on success.
- *
- * Returns 0 on success, -1 on error and reports libvirt error
- */
-static int
-qemuDomainChangeMediaLegacy(virQEMUDriver *driver,
-                            virDomainObj *vm,
-                            virDomainDiskDef *disk,
-                            virStorageSource *newsrc,
-                            bool force)
-{
-    int rc;
-    g_autofree char *driveAlias = NULL;
-    qemuDomainObjPrivate *priv = vm->privateData;
-    qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
-    const char *format = NULL;
-    g_autofree char *sourcestr = NULL;
-
-    if (!disk->info.alias) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("missing disk device alias name for %s"), disk->dst);
-        return -1;
-    }
-
-    if (!(driveAlias = qemuAliasDiskDriveFromDisk(disk)))
-        return -1;
-
-    qemuDomainObjEnterMonitor(driver, vm);
-    rc = qemuMonitorEjectMedia(priv->mon, driveAlias, force);
-    qemuDomainObjExitMonitor(vm);
-
-    /* If the tray is present wait for it to open. */
-    if (!force && diskPriv->tray) {
-        rc = qemuHotplugWaitForTrayEject(vm, disk);
-        if (rc < 0)
-            return -1;
-
-        /* re-issue ejection command to pop out the media */
-        qemuDomainObjEnterMonitor(driver, vm);
-        rc = qemuMonitorEjectMedia(priv->mon, driveAlias, false);
-        qemuDomainObjExitMonitor(vm);
-        if (rc < 0)
-            return -1;
-
-    } else  {
-        /* otherwise report possible errors from the attempt to eject the media */
-        if (rc < 0)
-            return -1;
-    }
-
-    if (!virStorageSourceIsEmpty(newsrc)) {
-        if (qemuGetDriveSourceString(newsrc, NULL, &sourcestr) < 0)
-            return -1;
-
-        if (virStorageSourceGetActualType(newsrc) != VIR_STORAGE_TYPE_DIR)
-            format = virStorageFileFormatTypeToString(newsrc->format);
-
-        qemuDomainObjEnterMonitor(driver, vm);
-        rc = qemuMonitorChangeMedia(priv->mon,
-                                    driveAlias,
-                                    sourcestr,
-                                    format);
-        qemuDomainObjExitMonitor(vm);
-    }
-
-    if (rc < 0)
-        return -1;
-
-    return 0;
-}
-
-
 /**
  * qemuHotplugAttachDBusVMState:
  * @driver: QEMU driver object
@@ -671,10 +588,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver,
     if (qemuHotplugAttachManagedPR(driver, vm, newsrc, VIR_ASYNC_JOB_NONE) < 0)
         goto cleanup;

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        rc = qemuDomainChangeMediaBlockdev(driver, vm, disk, oldsrc, newsrc, force);
-    else
-        rc = qemuDomainChangeMediaLegacy(driver, vm, disk, newsrc, force);
+    rc = qemuDomainChangeMediaBlockdev(driver, vm, disk, oldsrc, newsrc, force);

     virDomainAuditDisk(vm, oldsrc, newsrc, "update", rc >= 0);

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:35 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:35 +0200
Subject: [PATCH 57/80] qemu: monitor: Remove unused
 qemuMonitor(Eject|Change)Media
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f6ac066c134947bb16c312846e6605e1bea9d77f.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 27 -----------------
 src/qemu/qemu_monitor.h      |  9 ------
 src/qemu/qemu_monitor_json.c | 57 ------------------------------------
 src/qemu/qemu_monitor_json.h | 10 -------
 tests/qemumonitorjsontest.c  |  4 ---
 5 files changed, 107 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index f1a9524f28..456c54aed3 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2155,33 +2155,6 @@ qemuMonitorSetBalloon(qemuMonitor *mon,
 }


-int
-qemuMonitorEjectMedia(qemuMonitor *mon,
-                      const char *dev_name,
-                      bool force)
-{
-    VIR_DEBUG("dev_name=%s force=%d", dev_name, force);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONEjectMedia(mon, dev_name, force);
-}
-
-
-int
-qemuMonitorChangeMedia(qemuMonitor *mon,
-                       const char *dev_name,
-                       const char *newmedia,
-                       const char *format)
-{
-    VIR_DEBUG("dev_name=%s newmedia=%s format=%s", dev_name, newmedia, format);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONChangeMedia(mon, dev_name, newmedia, format);
-}
-
-
 int
 qemuMonitorSaveVirtualMemory(qemuMonitor *mon,
                              unsigned long long offset,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 6e657576ae..163e12c0f6 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -733,15 +733,6 @@ int qemuMonitorExpirePassword(qemuMonitor *mon,
 int qemuMonitorSetBalloon(qemuMonitor *mon,
                           unsigned long long newmem);

-int qemuMonitorEjectMedia(qemuMonitor *mon,
-                          const char *dev_name,
-                          bool force);
-int qemuMonitorChangeMedia(qemuMonitor *mon,
-                           const char *dev_name,
-                           const char *newmedia,
-                           const char *format);
-
-
 int qemuMonitorSaveVirtualMemory(qemuMonitor *mon,
                                  unsigned long long offset,
                                  unsigned long long length,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b4a33184bd..9c54d7cfa4 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2812,63 +2812,6 @@ qemuMonitorJSONSetBalloon(qemuMonitor *mon,
 }


-/**
- * Run QMP command to eject a media from ejectable device.
- *
- * Returns:
- *      -1 on error
- *      0 on success
- */
-int qemuMonitorJSONEjectMedia(qemuMonitor *mon,
-                              const char *dev_name,
-                              bool force)
-{
-    g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("eject",
-                                                             "s:device", dev_name,
-                                                             "b:force", force,
-                                                             NULL);
-    g_autoptr(virJSONValue) reply = NULL;
-
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-int qemuMonitorJSONChangeMedia(qemuMonitor *mon,
-                               const char *dev_name,
-                               const char *newmedia,
-                               const char *format)
-{
-    g_autoptr(virJSONValue) cmd = NULL;
-    g_autoptr(virJSONValue) reply = NULL;
-
-    cmd = qemuMonitorJSONMakeCommand("change",
-                                     "s:device", dev_name,
-                                     "s:target", newmedia,
-                                     "S:arg", format,
-                                     NULL);
-
-    if (!cmd)
-        return -1;
-
-    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-        return -1;
-
-    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-        return -1;
-
-    return 0;
-}
-
-
 static int qemuMonitorJSONSaveMemory(qemuMonitor *mon,
                                      const char *cmdtype,
                                      unsigned long long offset,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 9314baa5ba..44458f703d 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -128,16 +128,6 @@ int
 qemuMonitorJSONSetBalloon(qemuMonitor *mon,
                           unsigned long long newmem);

-int
-qemuMonitorJSONEjectMedia(qemuMonitor *mon,
-                          const char *dev_name,
-                          bool force);
-int
-qemuMonitorJSONChangeMedia(qemuMonitor *mon,
-                           const char *dev_name,
-                           const char *newmedia,
-                           const char *format);
-
 int
 qemuMonitorJSONSaveVirtualMemory(qemuMonitor *mon,
                                  unsigned long long offset,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index ced288cf5a..1368871cc8 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1199,8 +1199,6 @@ GEN_TEST_FUNC(qemuMonitorJSONBlockResize, "vda", "asdf", 123456)
 GEN_TEST_FUNC(qemuMonitorJSONSetPassword, "spice", "secret_password", "disconnect")
 GEN_TEST_FUNC(qemuMonitorJSONExpirePassword, "spice", "123456")
 GEN_TEST_FUNC(qemuMonitorJSONSetBalloon, 1024)
-GEN_TEST_FUNC(qemuMonitorJSONEjectMedia, "hdc", true)
-GEN_TEST_FUNC(qemuMonitorJSONChangeMedia, "hdc", "/foo/bar", "formatstr")
 GEN_TEST_FUNC(qemuMonitorJSONSaveVirtualMemory, 0, 1024, "/foo/bar")
 GEN_TEST_FUNC(qemuMonitorJSONSavePhysicalMemory, 0, 1024, "/foo/bar")
 GEN_TEST_FUNC(qemuMonitorJSONMigrate, QEMU_MONITOR_MIGRATE_BACKGROUND |
@@ -2988,8 +2986,6 @@ mymain(void)
     DO_TEST_GEN(qemuMonitorJSONSetPassword);
     DO_TEST_GEN(qemuMonitorJSONExpirePassword);
     DO_TEST_GEN(qemuMonitorJSONSetBalloon);
-    DO_TEST_GEN(qemuMonitorJSONEjectMedia);
-    DO_TEST_GEN_DEPRECATED(qemuMonitorJSONChangeMedia, true);
     DO_TEST_GEN(qemuMonitorJSONSaveVirtualMemory);
     DO_TEST_GEN(qemuMonitorJSONSavePhysicalMemory);
     DO_TEST_GEN(qemuMonitorJSONMigrate);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:31 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:31 +0200
Subject: [PATCH 53/80] qemuDomainBlocksStatsGather: Remove pre-blockdev code
 paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <56a074723d7cdff63e61ca820cc9c65209c07c73.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at 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 c2722c39da..59d1caa053 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -10054,7 +10054,6 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver,
                             qemuBlockStats **retstats)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     virDomainDiskDef *disk = NULL;
     g_autoptr(GHashTable) blockstats = NULL;
     qemuBlockStats *stats;
@@ -10090,12 +10089,8 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver,
     qemuDomainObjEnterMonitor(driver, vm);
     nstats = qemuMonitorGetAllBlockStatsInfo(priv->mon, &blockstats);

-    if (capacity && nstats >= 0) {
-        if (blockdev)
-            rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, blockstats);
-        else
-            rc = qemuMonitorBlockStatsUpdateCapacity(priv->mon, blockstats);
-    }
+    if (capacity && nstats >= 0)
+        rc = qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, blockstats);

     qemuDomainObjExitMonitor(vm);

@@ -10105,6 +10100,8 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver,
     *retstats = g_new0(qemuBlockStats, 1);

     if (entryname) {
+        qemuBlockStats *capstats;
+
         if (!(stats = virHashLookup(blockstats, entryname))) {
             virReportError(VIR_ERR_INTERNAL_ERROR,
                            _("cannot find statistics for device '%s'"), entryname);
@@ -10113,18 +10110,14 @@ qemuDomainBlocksStatsGather(virQEMUDriver *driver,

         **retstats = *stats;

-        if (blockdev) {
-            /* capacity are reported only per node-name so we need to transfer them */
-            qemuBlockStats *capstats;
-
-            if (disk && disk->src &&
-                (capstats = virHashLookup(blockstats, disk->src->nodeformat))) {
-                (*retstats)->capacity = capstats->capacity;
-                (*retstats)->physical = capstats->physical;
-                (*retstats)->wr_highest_offset = capstats->wr_highest_offset;
-                (*retstats)->wr_highest_offset_valid = capstats->wr_highest_offset_valid;
-                (*retstats)->write_threshold = capstats->write_threshold;
-            }
+        /* capacity are reported only per node-name so we need to transfer them */
+        if (disk && disk->src &&
+            (capstats = virHashLookup(blockstats, disk->src->nodeformat))) {
+            (*retstats)->capacity = capstats->capacity;
+            (*retstats)->physical = capstats->physical;
+            (*retstats)->wr_highest_offset = capstats->wr_highest_offset;
+            (*retstats)->wr_highest_offset_valid = capstats->wr_highest_offset_valid;
+            (*retstats)->write_threshold = capstats->write_threshold;
         }
     } else {
         for (i = 0; i < vm->def->ndisks; i++) {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:37 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:37 +0200
Subject: [PATCH 59/80] qemuDomainRemoveDiskDevice: Remove special casing for
 disks on 'sd' bus
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <36bfbafb71403e89a69998a966ad6863403a938c.1658843187.git.pkrempa@redhat.com>

SD card disks can't be detached, so it makes no sense to special case
them in the unplug code.

Signed-off-by: Peter Krempa <pkrempa at 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 a57db12144..3c35a115e3 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4299,7 +4299,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver,

         if (!(diskBackend = qemuBlockStorageSourceChainDetachPrepareChardev(chardevAlias)))
             goto cleanup;
-    } else if (blockdev && !qemuDiskBusIsSD(disk->bus)) {
+    } else if (blockdev) {
         if (diskPriv->blockjob) {
             /* the block job keeps reference to the disk chain */
             diskPriv->blockjob->disk = NULL;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:38 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:38 +0200
Subject: [PATCH 60/80] qemu: hotplug: Remove pre-blockdev code paths
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <80022624b1aa9e7dc76b1ad52d1b5870c62e85be.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_hotplug.c | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 3c35a115e3..d7f10d8277 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -656,7 +656,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
     g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
     qemuDomainObjPrivate *priv = vm->privateData;
     g_autoptr(virJSONValue) devprops = NULL;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     bool extensionDeviceAttached = false;
     int rc;
     g_autoptr(qemuSnapshotDiskContext) transientDiskSnapshotCtxt = NULL;
@@ -668,7 +667,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
     if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
         if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
             return -1;
-    } else if (blockdev) {
+    } else {
         if (!(data = qemuBuildStorageSourceChainAttachPrepareBlockdev(disk->src)))
             return -1;

@@ -678,10 +677,6 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,

             data->copyOnReadNodename = g_strdup(QEMU_DOMAIN_DISK_PRIVATE(disk)->nodeCopyOnRead);
         }
-
-    } else {
-        if (!(data = qemuBuildStorageSourceChainAttachPrepareDrive(disk)))
-            return -1;
     }

     disk->src->readonly = origReadonly;
@@ -733,7 +728,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
      * As there isn't anything sane to do if this fails, let's just return
      * success.
      */
-    if (blockdev && rc == 0 &&
+    if (rc == 0 &&
         qemuDiskConfigBlkdeviotuneEnabled(disk)) {
         qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
         if (qemuMonitorSetBlockIoThrottle(priv->mon, NULL, diskPriv->qomName,
@@ -4287,7 +4282,6 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver,
     g_autoptr(qemuBlockStorageSourceChainData) diskBackend = NULL;
     size_t i;
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     int ret = -1;

     VIR_DEBUG("Removing disk %s from domain %p %s",
@@ -4299,7 +4293,7 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver,

         if (!(diskBackend = qemuBlockStorageSourceChainDetachPrepareChardev(chardevAlias)))
             goto cleanup;
-    } else if (blockdev) {
+    } else {
         if (diskPriv->blockjob) {
             /* the block job keeps reference to the disk chain */
             diskPriv->blockjob->disk = NULL;
@@ -4315,14 +4309,6 @@ qemuDomainRemoveDiskDevice(virQEMUDriver *driver,
             diskBackend->copyOnReadNodename = g_strdup(diskPriv->nodeCopyOnRead);
             diskBackend->copyOnReadAttached = true;
         }
-    } else {
-        char *driveAlias;
-
-        if (!(driveAlias = qemuAliasDiskDriveFromDisk(disk)))
-            goto cleanup;
-
-        if (!(diskBackend = qemuBlockStorageSourceChainDetachPrepareDrive(disk->src, driveAlias)))
-            goto cleanup;
     }

     for (i = 0; i < vm->def->ndisks; i++) {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:33 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:33 +0200
Subject: [PATCH 55/80] qemu: driver: Remove remaining QEMU_CAPS_BLOCKDEV
 capability checks
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <7a6447db6897ebf852d3025b3fca6134f8bb9d43.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 59d1caa053..1ecc9a71b3 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9992,9 +9992,7 @@ qemuDomainBlockResize(virDomainPtr dom,
         goto endjob;
     }

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        !qemuDiskBusIsSD(disk->bus)) {
-
+    if (!qemuDiskBusIsSD(disk->bus)) {
         nodename = disk->src->nodeformat;
     } else {
         if (!(device = qemuAliasDiskDriveFromDisk(disk)))
@@ -16218,8 +16216,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
         /* blockdev-based qemu doesn't want to set the throttling when a cdrom
          * is empty. Skip the monitor call here since we will set the throttling
          * once new media is inserted */
-        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) ||
-            !virStorageSourceIsEmpty(disk->src)) {
+        if (!virStorageSourceIsEmpty(disk->src)) {
             int rc = 0;

             qemuDomainObjEnterMonitor(driver, vm);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:39 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:39 +0200
Subject: [PATCH 61/80] qemu: block: Remove unused
 qemuBlockStorageSourceChainDetachPrepareLegacy
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <bfd72f409754318e993f640f925ae4c4fb4002fe.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c | 26 --------------------------
 src/qemu/qemu_block.h |  3 ---
 2 files changed, 29 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index 6e643598bc..a5d9f47ec4 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1657,32 +1657,6 @@ qemuBlockStorageSourceChainDetachPrepareBlockdev(virStorageSource *src)
 }


-/**
- * qemuBlockStorageSourceChainDetachPrepareLegacy
- * @src: storage source chain to remove
- * @driveAlias: Alias of the 'drive' backend (always consumed)
- *
- * Prepares qemuBlockStorageSourceChainData *for detaching @src and its
- * backingStore if -drive was used.
- */
-qemuBlockStorageSourceChainData *
-qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSource *src,
-                                              char *driveAlias)
-{
-    g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL;
-    g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
-
-    data = g_new0(qemuBlockStorageSourceChainData, 1);
-
-    if (!(backend = qemuBlockStorageSourceDetachPrepare(src, driveAlias)))
-        return NULL;
-
-    VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, backend);
-
-    return g_steal_pointer(&data);
-}
-
-
 /**
  * qemuBlockStorageSourceChainDetachPrepareChardev
  * @src: storage source chain to remove
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index 422c1a0deb..a20a5e8a61 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -150,9 +150,6 @@ qemuBlockStorageSourceChainDataFree(qemuBlockStorageSourceChainData *data);
 qemuBlockStorageSourceChainData *
 qemuBlockStorageSourceChainDetachPrepareBlockdev(virStorageSource *src);
 qemuBlockStorageSourceChainData *
-qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSource *src,
-                                              char *driveAlias);
-qemuBlockStorageSourceChainData *
 qemuBlockStorageSourceChainDetachPrepareChardev(char *chardevAlias);

 int
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:30 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:30 +0200
Subject: [PATCH 52/80] qemuDomainBlockResize: Always refuse resize of
 empty/readonly disks
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <01d78054f8d3656942efd6c92e7666cbecf581b2.1658843187.git.pkrempa@redhat.com>

The operation makes no sense regardless of the way how we specify disks.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_driver.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f1fc954f8c..c2722c39da 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9985,14 +9985,15 @@ qemuDomainBlockResize(virDomainPtr dom,
         disk->src->format == VIR_STORAGE_FILE_QED)
         size = VIR_ROUND_UP(size, 512);

+    if (virStorageSourceIsEmpty(disk->src) || disk->src->readonly) {
+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                       _("can't resize empty or readonly disk '%s'"),
+                       disk->dst);
+        goto endjob;
+    }
+
     if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
         !qemuDiskBusIsSD(disk->bus)) {
-        if (virStorageSourceIsEmpty(disk->src) || disk->src->readonly) {
-            virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-                           _("can't resize empty or readonly disk '%s'"),
-                           disk->dst);
-            goto endjob;
-        }

         nodename = disk->src->nodeformat;
     } else {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:32 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:32 +0200
Subject: [PATCH 54/80] qemu: monitor: Remove unused
 qemuMonitorBlockStatsUpdateCapacity
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <8cc6a3b5ff721e542e934119f8ab53501a7c93d1.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 11 -------
 src/qemu/qemu_monitor.h      |  4 ---
 src/qemu/qemu_monitor_json.c | 59 ------------------------------------
 src/qemu/qemu_monitor_json.h |  3 --
 4 files changed, 77 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 5e71945831..f1a9524f28 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2022,17 +2022,6 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon,
 }


-/* Updates "stats" to fill virtual and physical size of the image */
-int
-qemuMonitorBlockStatsUpdateCapacity(qemuMonitor *mon,
-                                    GHashTable *stats)
-{
-    QEMU_CHECK_MONITOR(mon);
-
-    return qemuMonitorJSONBlockStatsUpdateCapacity(mon, stats);
-}
-
-
 int
 qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon,
                                             GHashTable *stats)
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 24a33b9b29..6e657576ae 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -681,10 +681,6 @@ int qemuMonitorGetAllBlockStatsInfo(qemuMonitor *mon,
                                     GHashTable **ret_stats)
     ATTRIBUTE_NONNULL(2);

-int qemuMonitorBlockStatsUpdateCapacity(qemuMonitor *mon,
-                                        GHashTable *stats)
-    ATTRIBUTE_NONNULL(2);
-
 int qemuMonitorBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon,
                                                 GHashTable *stats)
     ATTRIBUTE_NONNULL(2);
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 85a36ff68b..b4a33184bd 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2497,65 +2497,6 @@ qemuMonitorJSONBlockStatsUpdateCapacityData(virJSONValue *image,
 }


-static int
-qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValue *image,
-                                           const char *dev_name,
-                                           int depth,
-                                           GHashTable *stats)
-{
-    g_autofree char *entry_name = qemuDomainStorageAlias(dev_name, depth);
-    virJSONValue *backing;
-
-    if (qemuMonitorJSONBlockStatsUpdateCapacityData(image, entry_name,
-                                                    stats, NULL) < 0)
-        return -1;
-
-    if ((backing = virJSONValueObjectGetObject(image, "backing-image")) &&
-        qemuMonitorJSONBlockStatsUpdateCapacityOne(backing,
-                                                   dev_name,
-                                                   depth + 1,
-                                                   stats) < 0)
-        return -1;
-
-    return 0;
-}
-
-
-int
-qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitor *mon,
-                                        GHashTable *stats)
-{
-    size_t i;
-    g_autoptr(virJSONValue) devices = NULL;
-
-    if (!(devices = qemuMonitorJSONQueryBlock(mon)))
-        return -1;
-
-    for (i = 0; i < virJSONValueArraySize(devices); i++) {
-        virJSONValue *dev;
-        virJSONValue *inserted;
-        virJSONValue *image;
-        const char *dev_name;
-
-        if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
-            return -1;
-
-        if (!(dev_name = qemuMonitorJSONGetBlockDevDevice(dev)))
-            return -1;
-
-        /* drive may be empty */
-        if (!(inserted = virJSONValueObjectGetObject(dev, "inserted")) ||
-            !(image = virJSONValueObjectGetObject(inserted, "image")))
-            continue;
-
-        if (qemuMonitorJSONBlockStatsUpdateCapacityOne(image, dev_name, 0, stats) < 0)
-            return -1;
-    }
-
-    return 0;
-}
-
-
 static int
 qemuMonitorJSONBlockStatsUpdateCapacityBlockdevWorker(size_t pos G_GNUC_UNUSED,
                                                       virJSONValue *val,
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index c5716dfe3e..9314baa5ba 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -99,9 +99,6 @@ int
 qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitor *mon,
                                     GHashTable *hash);
 int
-qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitor *mon,
-                                        GHashTable *stats);
-int
 qemuMonitorJSONBlockStatsUpdateCapacityBlockdev(qemuMonitor *mon,
                                                 GHashTable *stats);

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:40 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:40 +0200
Subject: [PATCH 62/80] qemu: Remove 'driveAlias' argument of
 qemuBlockStorageSourceDetachPrepare
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f57cab3df8bb95a999657bc08d93e6c3a38c8d46.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c    | 33 +++++++++++++--------------------
 src/qemu/qemu_block.h    |  3 +--
 src/qemu/qemu_blockjob.c |  4 ++--
 src/qemu/qemu_hotplug.c  |  2 +-
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index a5d9f47ec4..afdcca2813 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1555,36 +1555,29 @@ qemuBlockStorageSourceAttachRollback(qemuMonitor *mon,
 /**
  * qemuBlockStorageSourceDetachPrepare:
  * @src: disk source structure
- * @driveAlias: Alias of the -drive backend, the pointer is always consumed
  *
  * Prepare qemuBlockStorageSourceAttachData *for detaching a single source
- * from a VM. If @driveAlias is NULL -blockdev is assumed.
+ * from a VM.
  */
 qemuBlockStorageSourceAttachData *
-qemuBlockStorageSourceDetachPrepare(virStorageSource *src,
-                                    char *driveAlias)
+qemuBlockStorageSourceDetachPrepare(virStorageSource *src)
 {
     qemuDomainStorageSourcePrivate *srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
     g_autoptr(qemuBlockStorageSourceAttachData) data = NULL;

     data = g_new0(qemuBlockStorageSourceAttachData, 1);

-    if (driveAlias) {
-        data->driveAlias = g_steal_pointer(&driveAlias);
-        data->driveAdded = true;
-    } else {
-        data->formatNodeName = src->nodeformat;
-        data->formatAttached = true;
-        data->storageNodeName = src->nodestorage;
-        data->storageAttached = true;
+    data->formatNodeName = src->nodeformat;
+    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;
-        }
+    /* '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 &&
@@ -1647,7 +1640,7 @@ qemuBlockStorageSourceChainDetachPrepareBlockdev(virStorageSource *src)
     data = g_new0(qemuBlockStorageSourceChainData, 1);

     for (n = src; virStorageSourceIsBacking(n); n = n->backingStore) {
-        if (!(backend = qemuBlockStorageSourceDetachPrepare(n, NULL)))
+        if (!(backend = qemuBlockStorageSourceDetachPrepare(n)))
             return NULL;

         VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, backend);
diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index a20a5e8a61..d29d444a5a 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -116,8 +116,7 @@ qemuBlockStorageSourceAttachPrepareBlockdev(virStorageSource *src,
                                             bool autoreadonly);

 qemuBlockStorageSourceAttachData *
-qemuBlockStorageSourceDetachPrepare(virStorageSource *src,
-                                    char *driveAlias);
+qemuBlockStorageSourceDetachPrepare(virStorageSource *src);

 int
 qemuBlockStorageSourceAttachApply(qemuMonitor *mon,
diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 03c46923b3..62ed71f5a8 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -1328,7 +1328,7 @@ qemuBlockJobProcessEventConcludedCreate(virQEMUDriver *driver,
     if (!job->data.create.src)
         return;

-    if (!(backend = qemuBlockStorageSourceDetachPrepare(job->data.create.src, NULL)))
+    if (!(backend = qemuBlockStorageSourceDetachPrepare(job->data.create.src)))
         return;

     /* the format node part was not attached yet, so we don't need to detach it */
@@ -1365,7 +1365,7 @@ qemuBlockJobProcessEventConcludedBackup(virQEMUDriver *driver,
                                 progressCurrent, progressTotal, asyncJob);

     if (job->data.backup.store &&
-        !(backend = qemuBlockStorageSourceDetachPrepare(job->data.backup.store, NULL)))
+        !(backend = qemuBlockStorageSourceDetachPrepare(job->data.backup.store)))
         return;

     if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index d7f10d8277..a752702fc4 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -706,7 +706,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriver *driver,
             goto rollback;

         QEMU_DOMAIN_DISK_PRIVATE(disk)->transientOverlayCreated = true;
-        backend = qemuBlockStorageSourceDetachPrepare(disk->src, NULL);
+        backend = qemuBlockStorageSourceDetachPrepare(disk->src);
         ignore_value(VIR_INSERT_ELEMENT(data->srcdata, 0, data->nsrcdata, backend));
     }

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:36 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:36 +0200
Subject: [PATCH 58/80] qemuhotplugtest: Switch to -blockdev mode
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <a61734e43b87ae8bf3d941911a9340e40d9a2612.1658843187.git.pkrempa@redhat.com>

Enable blockdev mode and convert the expected commands to the modern
equivalents in preparation for removing the old-style hotplug code
paths.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 tests/qemuhotplugtest.c                       | 75 ++++++++++++-------
 .../qemuhotplug-base-ccw-live+ccw-virtio.xml  |  2 +-
 ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml |  4 +-
 ...otplug-base-ccw-live-with-2-ccw-virtio.xml |  2 +-
 ...-with-ccw-virtio+ccw-virtio-2-explicit.xml |  2 +-
 ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml |  2 +-
 .../qemuhotplug-base-live+cdrom-scsi.xml      |  2 +-
 .../qemuhotplug-base-live+cdrom-usb.xml       |  2 +-
 ...uhotplug-base-live+disk-scsi-multipath.xml |  2 +-
 ...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml |  2 +-
 .../qemuhotplug-base-live+disk-scsi.xml       |  2 +-
 .../qemuhotplug-base-live+disk-usb.xml        |  2 +-
 .../qemuhotplug-base-live+disk-virtio.xml     |  2 +-
 ...thout-scsi-controller-live+disk-scsi-2.xml |  2 +-
 14 files changed, 62 insertions(+), 41 deletions(-)

diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index c938c8dc4c..5edcf3d989 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -73,6 +73,7 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,

     virQEMUCapsInitQMPBasicArch(priv->qemuCaps);

+    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW);
@@ -670,7 +671,6 @@ mymain(void)


 #define QMP_OK      "{\"return\": {}}"
-#define HMP(msg)    "{\"return\": \"" msg "\"}"

 #define QMP_DEVICE_DELETED(dev) \
     "{" \
@@ -707,31 +707,37 @@ mymain(void)
                    "chardev-remove", QMP_OK, "query-fdsets", "{\"return\": []}");

     DO_TEST_ATTACH("base-live", "disk-virtio", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-virtio", true, true,
                    "device_del", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-virtio", false, false,
                    "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-live", "disk-usb", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-usb", true, true,
                    "device_del", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-usb", false, false,
                    "device_del", QMP_DEVICE_DELETED("usb-disk16") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-live", "disk-scsi", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-scsi", true, true,
                    "device_del", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-scsi", false, false,
                    "device_del", QMP_DEVICE_DELETED("scsi0-0-0-5") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-without-scsi-controller-live", "disk-scsi-2", false, true,
                    /* Four controllers added */
@@ -739,24 +745,27 @@ mymain(void)
                    "device_add", QMP_OK,
                    "device_add", QMP_OK,
                    "device_add", QMP_OK,
-                   "human-monitor-command", HMP("OK\\r\\n"),
-                   /* Disk added */
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", true, true,
                    "device_del", QMP_OK);
     DO_TEST_DETACH("base-with-scsi-controller-live", "disk-scsi-2", false, false,
                    "device_del", QMP_DEVICE_DELETED("scsi3-0-5-6") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-live", "disk-scsi-multipath", false, true,
                    "object-add", QMP_OK,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-live", "disk-scsi-multipath", true, true,
                    "device_del", QMP_OK);
     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(""),
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK,
                    "object-del", QMP_OK);

     DO_TEST_ATTACH("base-live", "qemu-agent", false, true,
@@ -768,39 +777,46 @@ mymain(void)
                    "chardev-remove", QMP_OK, "query-fdsets", "{\"return\": []}");

     DO_TEST_ATTACH("base-ccw-live", "ccw-virtio", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-ccw-live", "ccw-virtio", false, false,
                    "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);

     DO_TEST_DETACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2", false, false,
                    "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);

     DO_TEST_DETACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, false,
                    "device_del", QMP_DEVICE_DELETED("virtio-disk0") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     /* Attach a second device, then detach the first one. Then attach the first one again. */
     DO_TEST_ATTACH("base-ccw-live-with-ccw-virtio", "ccw-virtio-2-explicit", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);

     DO_TEST_DETACH("base-ccw-live-with-2-ccw-virtio", "ccw-virtio-1-explicit", false, true,
-                   "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "device_del", QMP_DEVICE_DELETED("virtio-disk4") QMP_OK);

     DO_TEST_ATTACH("base-ccw-live-with-2-ccw-virtio", "ccw-virtio-1-reverse", false, false,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);

     DO_TEST_ATTACH("base-live", "ivshmem-plain", false, true,
@@ -817,7 +833,8 @@ mymain(void)
                    "object-del", QMP_OK);
     DO_TEST_ATTACH("base-live+disk-scsi-wwn",
                    "disk-scsi-duplicate-wwn", false, false,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);

     DO_TEST_ATTACH("base-live", "hostdev-pci", false, true,
@@ -861,22 +878,26 @@ mymain(void)
                    "netdev_del", QMP_OK);

     DO_TEST_ATTACH("base-live", "cdrom-usb", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-live", "cdrom-usb", true, true,
                    "device_del", QMP_OK);
     DO_TEST_DETACH("base-live", "cdrom-usb", false, false,
                    "device_del", QMP_DEVICE_DELETED("usb-disk4") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

     DO_TEST_ATTACH("base-live", "cdrom-scsi", false, true,
-                   "human-monitor-command", HMP("OK\\r\\n"),
+                   "blockdev-add", QMP_OK,
+                   "blockdev-add", QMP_OK,
                    "device_add", QMP_OK);
     DO_TEST_DETACH("base-live", "cdrom-scsi", true, true,
                    "device_del", QMP_OK);
     DO_TEST_DETACH("base-live", "cdrom-scsi", false, false,
                    "device_del", QMP_DEVICE_DELETED("scsi0-0-0-4") QMP_OK,
-                   "human-monitor-command", HMP(""));
+                   "blockdev-del", QMP_OK,
+                   "blockdev-del", QMP_OK);

 #define DO_TEST_CPU_GROUP(prefix, vcpus, modernhp, expectfail) \
     do { \
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
index a786d03185..4036adde89 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='vde' bus='virtio'/>
       <readonly/>
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 e048d2c23a..2eb7f9eb0e 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
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='hda' bus='virtio'/>
       <readonly/>
@@ -31,7 +31,7 @@
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='2'/>
       <backingStore/>
       <target dev='hdb' bus='virtio'/>
       <readonly/>
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 fcf5bfadcb..935925bdba 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
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='hda' bus='virtio'/>
       <readonly/>
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 8e7f479967..51fe4b461a 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
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='hda' bus='virtio'/>
       <readonly/>
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 8e7f479967..51fe4b461a 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
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='hda' bus='virtio'/>
       <readonly/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
index c3242a582f..922e9c1b4e 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-scsi.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='sde' bus='scsi'/>
       <readonly/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml
index 89317f5dc8..ba8ce3b2c8 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+cdrom-usb.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='cdrom'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='sde' bus='usb'/>
       <readonly/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
index caf1c06c2f..c43e023495 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='lun'>
       <driver name='qemu' type='raw'/>
-      <source dev='/dev/mapper/virt'>
+      <source dev='/dev/mapper/virt' index='1'>
         <reservations managed='yes'>
           <source type='unix' path='/tmp/lib/domain-7-hotplug/pr-helper0.sock' mode='client'/>
         </reservations>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
index ba99d0c2e4..b3089b2006 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
@@ -32,7 +32,7 @@
     </disk>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='sdg' bus='scsi'/>
       <readonly/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
index 66302b3872..4241b3b71a 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='sdf' bus='scsi'/>
       <readonly/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
index b462ad48e4..4202ded5b3 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='sdq' bus='usb'/>
       <readonly/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
index af68d7fc6e..02851d4ca1 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='vde' bus='virtio'/>
       <readonly/>
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 ddc57cbb16..71dd10d40d 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
@@ -21,7 +21,7 @@
     <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='file' device='disk'>
       <driver name='qemu' type='raw' cache='none'/>
-      <source file='/dev/null'/>
+      <source file='/dev/null' index='1'/>
       <backingStore/>
       <target dev='sdf' bus='scsi'/>
       <readonly/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:42 +0200
Subject: [PATCH 64/80] qemu: monitor: Remove unused
 qemuMonitorAddDrive/qemuMonitorDriveDel
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <d27ea96881a91a04724f9ad065a4ff6ac584b767.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_monitor.c      | 33 ---------------
 src/qemu/qemu_monitor.h      |  6 ---
 src/qemu/qemu_monitor_text.c | 82 ------------------------------------
 src/qemu/qemu_monitor_text.h |  6 ---
 4 files changed, 127 deletions(-)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 456c54aed3..93890c43be 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2605,26 +2605,6 @@ qemuMonitorGetChardevInfo(qemuMonitor *mon,
 }


-/**
- * qemuMonitorDriveDel:
- * @mon: monitor object
- * @drivestr: identifier of drive to delete.
- *
- * Attempts to remove a host drive.
- * Returns 1 if unsupported, 0 if ok, and -1 on other failure */
-int
-qemuMonitorDriveDel(qemuMonitor *mon,
-                    const char *drivestr)
-{
-    VIR_DEBUG("drivestr=%s", drivestr);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    /* there won't be a direct replacement for drive_del in QMP */
-    return qemuMonitorTextDriveDel(mon, drivestr);
-}
-
-
 /**
  * @mon: monitor object
  * @devalias: alias of the device to detach
@@ -2796,19 +2776,6 @@ qemuMonitorDelObject(qemuMonitor *mon,
 }


-int
-qemuMonitorAddDrive(qemuMonitor *mon,
-                    const char *drivestr)
-{
-    VIR_DEBUG("drive=%s", drivestr);
-
-    QEMU_CHECK_MONITOR(mon);
-
-    /* there won't ever be a direct QMP replacement for this function */
-    return qemuMonitorTextAddDrive(mon, drivestr);
-}
-
-
 int
 qemuMonitorCreateSnapshot(qemuMonitor *mon, const char *name)
 {
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 163e12c0f6..830be5418c 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -955,12 +955,6 @@ int qemuMonitorDelObject(qemuMonitor *mon,
                          const char *objalias,
                          bool report_error);

-int qemuMonitorAddDrive(qemuMonitor *mon,
-                        const char *drivestr);
-
-int qemuMonitorDriveDel(qemuMonitor *mon,
-                        const char *drivestr);
-
 int qemuMonitorCreateSnapshot(qemuMonitor *mon, const char *name);
 int qemuMonitorDeleteSnapshot(qemuMonitor *mon, const char *name);

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 65785f1dae..8e70b8f78d 100644
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -31,88 +31,6 @@

 VIR_LOG_INIT("qemu.qemu_monitor_text");

-int qemuMonitorTextAddDrive(qemuMonitor *mon,
-                            const char *drivestr)
-{
-    g_autofree char *cmd = NULL;
-    g_autofree char *reply = NULL;
-
-    /* 'dummy' here is just a placeholder since there is no PCI
-     * address required when attaching drives to a controller */
-    cmd = g_strdup_printf("drive_add dummy %s", drivestr);
-
-    if (qemuMonitorJSONHumanCommand(mon, cmd, -1, &reply) < 0)
-        return -1;
-
-    if (strstr(reply, "unknown command:")) {
-        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                       _("drive hotplug is not supported"));
-        return -1;
-    }
-
-    if (strstr(reply, "could not open disk image")) {
-        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                       _("open disk image file failed"));
-        return -1;
-    }
-
-    if (strstr(reply, "Could not open")) {
-        size_t len = strlen(reply);
-        if (reply[len - 1] == '\n')
-            reply[len - 1] = '\0';
-
-        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                       reply);
-        return -1;
-    }
-
-    if (strstr(reply, "Image is not in")) {
-        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                       _("Incorrect disk format"));
-        return -1;
-    }
-
-    if (strstr(reply, "IOMMU") ||
-        strstr(reply, "VFIO")) {
-        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                       reply);
-        return -1;
-    }
-
-    return 0;
-}
-
-
-int qemuMonitorTextDriveDel(qemuMonitor *mon,
-                            const char *drivestr)
-{
-    g_autofree char *cmd = NULL;
-    g_autofree char *reply = NULL;
-
-    cmd = g_strdup_printf("drive_del %s", drivestr);
-
-    if (qemuMonitorJSONHumanCommand(mon, cmd, -1, &reply) < 0)
-        return -1;
-
-    if (strstr(reply, "unknown command:")) {
-        VIR_ERROR(_("deleting drive is not supported.  "
-                    "This may leak data if disk is reassigned"));
-        return 1;
-
-    /* (qemu) drive_del wark
-     * Device 'wark' not found */
-    } else if (strstr(reply, "Device '") && strstr(reply, "not found")) {
-        /* NB: device not found errors mean the drive was auto-deleted and we
-         * ignore the error */
-    } else if (STRNEQ(reply, "")) {
-        virReportError(VIR_ERR_OPERATION_FAILED,
-                       _("deleting %s drive failed: %s"), drivestr, reply);
-        return -1;
-    }
-
-    return 0;
-}
-
 int
 qemuMonitorTextCreateSnapshot(qemuMonitor *mon,
                               const char *name)
diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h
index d959fc8889..27d0f061d3 100644
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@@ -25,11 +25,5 @@

 #include "qemu_monitor.h"

-int qemuMonitorTextAddDrive(qemuMonitor *mon,
-                             const char *drivestr);
-
-int qemuMonitorTextDriveDel(qemuMonitor *mon,
-                             const char *drivestr);
-
 int qemuMonitorTextCreateSnapshot(qemuMonitor *mon, const char *name);
 int qemuMonitorTextDeleteSnapshot(qemuMonitor *mon, const char *name);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:46 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:46 +0200
Subject: [PATCH 68/80] qemu: domain: Assume QEMU_CAPS_BLOCKDEV for the domain
 private code
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <641e53c3dcd1fd1288f529d457fe669192940a77.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c                        | 20 ++++++++-----------
 .../blockjob-mirror-in.xml                    |  1 +
 .../migration-in-params-in.xml                |  1 +
 .../migration-out-nbd-out.xml                 |  1 +
 .../migration-out-nbd-tls-out.xml             |  1 +
 .../migration-out-params-in.xml               |  1 +
 tests/qemustatusxml2xmldata/upgrade-out.xml   |  1 +
 .../qemustatusxml2xmldata/vcpus-multi-in.xml  |  1 +
 8 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8b55dd0361..32319c1503 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2167,8 +2167,7 @@ qemuDomainObjPrivateXMLFormatBlockjobs(virBuffer *buf,
     virBufferAsprintf(&attrBuf, " active='%s'",
                       virTristateBoolTypeToString(virTristateBoolFromBool(bj)));

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        virHashForEachSorted(priv->blockjobs,
+    if (virHashForEachSorted(priv->blockjobs,
                              qemuDomainObjPrivateXMLFormatBlockjobIterator,
                              &iterdata) < 0)
         return -1;
@@ -2388,8 +2387,7 @@ qemuDomainObjPrivateXMLFormat(virBuffer *buf,

     qemuDomainObjPrivateXMLFormatPR(buf, priv);

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV))
-        virBufferAsprintf(buf, "<nodename index='%llu'/>\n", priv->nodenameindex);
+    virBufferAsprintf(buf, "<nodename index='%llu'/>\n", priv->nodenameindex);

     virBufferAsprintf(buf, "<fdset index='%u'/>\n", priv->fdsetindex);

@@ -2817,15 +2815,13 @@ qemuDomainObjPrivateXMLParseBlockjobs(virDomainObj *vm,
         (tmp = virTristateBoolTypeFromString(active)) > 0)
         priv->reconnectBlockjobs = tmp;

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-        if ((nnodes = virXPathNodeSet("./blockjobs/blockjob", ctxt, &nodes)) < 0)
-            return -1;
+    if ((nnodes = virXPathNodeSet("./blockjobs/blockjob", ctxt, &nodes)) < 0)
+        return -1;

-        for (i = 0; i < nnodes; i++) {
-            if (qemuDomainObjPrivateXMLParseBlockjobData(vm, nodes[i], ctxt,
-                                                         priv->driver->xmlopt) < 0)
-                return -1;
-        }
+    for (i = 0; i < nnodes; i++) {
+        if (qemuDomainObjPrivateXMLParseBlockjobData(vm, nodes[i], ctxt,
+                                                     priv->driver->xmlopt) < 0)
+            return -1;
     }

     return 0;
diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
index 73fe437f87..e9f1d77856 100644
--- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -22,6 +22,7 @@
   <libDir path='/tmp'/>
   <channelTargetDir path='/tmp/channel'/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='yes'/>
   <agentTimeout>-2</agentTimeout>
diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
index 1086f5230d..03773a089b 100644
--- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
@@ -256,6 +256,7 @@
   <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-1-nest'/>
   <chardevStdioLogd/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='no'/>
   <agentTimeout>-2</agentTimeout>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
index 540e385de3..de92146eaa 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
@@ -259,6 +259,7 @@
   <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-4-upstream'/>
   <chardevStdioLogd/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='no'/>
   <agentTimeout>-2</agentTimeout>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
index d0e997913f..6bdd128259 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
@@ -288,6 +288,7 @@
   <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-3-upstream'/>
   <chardevStdioLogd/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='no'/>
   <agentTimeout>-2</agentTimeout>
diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
index 758a6f03b7..24ee86e4c0 100644
--- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
@@ -270,6 +270,7 @@
   <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-7-nest'/>
   <chardevStdioLogd/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='no'/>
   <agentTimeout>-2</agentTimeout>
diff --git a/tests/qemustatusxml2xmldata/upgrade-out.xml b/tests/qemustatusxml2xmldata/upgrade-out.xml
index ac2ffeddc2..e663b3dbb5 100644
--- a/tests/qemustatusxml2xmldata/upgrade-out.xml
+++ b/tests/qemustatusxml2xmldata/upgrade-out.xml
@@ -258,6 +258,7 @@
   <channelTargetDir path='/var/lib/libvirt/qemu/channel/target/domain-1-upstream'/>
   <chardevStdioLogd/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='no'/>
   <agentTimeout>-2</agentTimeout>
diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
index 0b8bc37c15..e71d6a83c7 100644
--- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
+++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
@@ -308,6 +308,7 @@
   <libDir path='/tmp'/>
   <channelTargetDir path='/tmp/channel'/>
   <allowReboot value='yes'/>
+  <nodename index='0'/>
   <fdset index='0'/>
   <blockjobs active='no'/>
   <agentTimeout>-2</agentTimeout>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:43 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:43 +0200
Subject: [PATCH 65/80] qemu: command: Delegate qemuBuildDriveStr to SD cards
 only
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <0b85db1d9c1a1d17b54b1e8c287800f95129e6eb.1658843187.git.pkrempa@redhat.com>

Remove the generic frontend-less -drive code from qemuBuildDriveStr by
assuming that we support only blockdev-enabled qemus.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 865464a772..aec9e7415f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2039,17 +2039,7 @@ qemuBuildDriveStr(virDomainDiskDef *disk)
     if (qemuBuildDriveSourceStr(disk, &opt) < 0)
         return NULL;

-    if (!qemuDiskBusIsSD(disk->bus)) {
-        g_autofree char *drivealias = qemuAliasDiskDriveFromDisk(disk);
-        if (!drivealias)
-            return NULL;
-
-        virBufferAddLit(&opt, "if=none");
-        virBufferAsprintf(&opt, ",id=%s", drivealias);
-    } else {
-        virBufferAsprintf(&opt, "if=sd,index=%d",
-                          virDiskNameToIndex(disk->dst));
-    }
+    virBufferAsprintf(&opt, "if=sd,index=%d", virDiskNameToIndex(disk->dst));

     if (disk->src->readonly)
         virBufferAddLit(&opt, ",readonly=on");
@@ -2522,8 +2512,7 @@ qemuBuildDiskSourceCommandLine(virCommand *cmd,
     if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
         if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
             return -1;
-    } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        !qemuDiskBusIsSD(disk->bus)) {
+    } else if (!qemuDiskBusIsSD(disk->bus)) {
         if (virStorageSourceIsEmpty(disk->src))
             return 0;

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:45 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:45 +0200
Subject: [PATCH 67/80] qemu: command: Remove unused qemuGetDriveSourceString
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <f6f8f15b28490eb6519e468fa13c09c9d5da8038.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 208 ----------------------------------------
 src/qemu/qemu_command.h |   4 -
 2 files changed, 212 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 9fc3d91a42..a8c954edf6 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1558,214 +1558,6 @@ qemuBuildChardevCommand(virCommand *cmd,
 }


-static char *
-qemuBuildNetworkDriveURI(virStorageSource *src)
-{
-    g_autoptr(virURI) uri = NULL;
-
-    if (!(uri = qemuBlockStorageSourceGetURI(src)))
-        return NULL;
-
-    if (src->hosts->socket)
-        uri->query = g_strdup_printf("socket=%s", src->hosts->socket);
-
-    return virURIFormat(uri);
-}
-
-
-static char *
-qemuBuildNetworkDriveStr(virStorageSource *src,
-                         qemuDomainSecretInfo *secinfo)
-{
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    size_t i;
-    char *ret = NULL;
-
-    switch ((virStorageNetProtocol) src->protocol) {
-        case VIR_STORAGE_NET_PROTOCOL_NBD:
-            if (src->nhosts != 1) {
-                virReportError(VIR_ERR_INTERNAL_ERROR,
-                               _("protocol '%s' accepts only one host"),
-                               virStorageNetProtocolTypeToString(src->protocol));
-                return NULL;
-            }
-
-            if (!((src->hosts->name && strchr(src->hosts->name, ':')) ||
-                  (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_TCP &&
-                   !src->hosts->name) ||
-                  (src->hosts->transport == VIR_STORAGE_NET_HOST_TRANS_UNIX &&
-                   src->hosts->socket &&
-                   !g_path_is_absolute(src->hosts->socket)))) {
-
-                virBufferAddLit(&buf, "nbd:");
-
-                switch (src->hosts->transport) {
-                case VIR_STORAGE_NET_HOST_TRANS_TCP:
-                    virBufferAsprintf(&buf, "%s:%u",
-                                      src->hosts->name, src->hosts->port);
-                    break;
-
-                case VIR_STORAGE_NET_HOST_TRANS_UNIX:
-                    if (!src->hosts->socket) {
-                        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                                       _("socket attribute required for "
-                                         "unix transport"));
-                        return NULL;
-                    }
-
-                    virBufferAsprintf(&buf, "unix:%s", src->hosts->socket);
-                    break;
-
-                default:
-                    virReportError(VIR_ERR_INTERNAL_ERROR,
-                                   _("nbd does not support transport '%s'"),
-                                   virStorageNetHostTransportTypeToString(src->hosts->transport));
-                    return NULL;
-                }
-
-                if (src->path)
-                    virBufferAsprintf(&buf, ":exportname=%s", src->path);
-
-                return virBufferContentAndReset(&buf);
-            }
-            /* NBD code uses URI formatting scheme as others in some cases */
-            ret = qemuBuildNetworkDriveURI(src);
-            break;
-
-        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:
-            ret = qemuBuildNetworkDriveURI(src);
-            break;
-
-        case VIR_STORAGE_NET_PROTOCOL_SHEEPDOG:
-            if (!src->path) {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("missing disk source for 'sheepdog' protocol"));
-                return NULL;
-            }
-
-            if (src->nhosts == 0) {
-                ret = g_strdup_printf("sheepdog:%s", src->path);
-            } else if (src->nhosts == 1) {
-                ret = g_strdup_printf("sheepdog:%s:%u:%s", src->hosts->name,
-                                      src->hosts->port, src->path);
-            } else {
-                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                               _("protocol 'sheepdog' accepts up to one host"));
-                return NULL;
-            }
-
-            break;
-
-        case VIR_STORAGE_NET_PROTOCOL_RBD:
-            if (strchr(src->path, ':')) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                               _("':' not allowed in RBD source volume name '%s'"),
-                               src->path);
-                return NULL;
-            }
-
-            virBufferStrcat(&buf, "rbd:", src->volume, "/", src->path, NULL);
-
-            if (src->snapshot)
-                virBufferEscape(&buf, '\\', ":", "@%s", src->snapshot);
-
-            if (!secinfo)
-                virBufferAddLit(&buf, ":auth_supported=none");
-            else
-                virBufferEscape(&buf, '\\', ":", ":id=%s:auth_supported=cephx\\;none",
-                                secinfo->username);
-
-            if (src->nhosts > 0) {
-                virBufferAddLit(&buf, ":mon_host=");
-                for (i = 0; i < src->nhosts; i++) {
-                    if (i)
-                        virBufferAddLit(&buf, "\\;");
-
-                    /* assume host containing : is ipv6 */
-                    if (strchr(src->hosts[i].name, ':'))
-                        virBufferEscape(&buf, '\\', ":", "[%s]",
-                                        src->hosts[i].name);
-                    else
-                        virBufferAsprintf(&buf, "%s", src->hosts[i].name);
-
-                    if (src->hosts[i].port)
-                        virBufferAsprintf(&buf, "\\:%u", src->hosts[i].port);
-                }
-            }
-
-            if (src->configFile)
-                virBufferEscape(&buf, '\\', ":", ":conf=%s", src->configFile);
-
-            ret = virBufferContentAndReset(&buf);
-            break;
-
-        case VIR_STORAGE_NET_PROTOCOL_VXHS:
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("VxHS protocol does not support URI syntax"));
-            return NULL;
-
-        case VIR_STORAGE_NET_PROTOCOL_SSH:
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("'ssh' protocol is not yet supported"));
-            return NULL;
-
-        case VIR_STORAGE_NET_PROTOCOL_NFS:
-        case VIR_STORAGE_NET_PROTOCOL_LAST:
-        case VIR_STORAGE_NET_PROTOCOL_NONE:
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("Unexpected network protocol '%s'"),
-                           virStorageNetProtocolTypeToString(src->protocol));
-            return NULL;
-    }
-
-    return ret;
-}
-
-
-int
-qemuGetDriveSourceString(virStorageSource *src,
-                         qemuDomainSecretInfo *secinfo,
-                         char **source)
-{
-    virStorageType actualType = virStorageSourceGetActualType(src);
-
-    *source = NULL;
-
-    /* return 1 for empty sources */
-    if (virStorageSourceIsEmpty(src))
-        return 1;
-
-    switch (actualType) {
-    case VIR_STORAGE_TYPE_BLOCK:
-    case VIR_STORAGE_TYPE_FILE:
-    case VIR_STORAGE_TYPE_DIR:
-        *source = g_strdup(src->path);
-
-        break;
-
-    case VIR_STORAGE_TYPE_NETWORK:
-        if (!(*source = qemuBuildNetworkDriveStr(src, secinfo)))
-            return -1;
-        break;
-
-    case VIR_STORAGE_TYPE_VOLUME:
-    case VIR_STORAGE_TYPE_NVME:
-    case VIR_STORAGE_TYPE_VHOST_USER:
-    case VIR_STORAGE_TYPE_NONE:
-    case VIR_STORAGE_TYPE_LAST:
-        break;
-    }
-
-    return 0;
-}
-
-
 bool
 qemuDiskConfigBlkdeviotuneEnabled(virDomainDiskDef *disk)
 {
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 6d2adcfc16..2578367df9 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -197,10 +197,6 @@ qemuBuildZPCIDevProps(virDomainDeviceInfo *dev);

 int qemuNetworkPrepareDevices(virDomainDef *def);

-int qemuGetDriveSourceString(virStorageSource *src,
-                             qemuDomainSecretInfo *secinfo,
-                             char **source);
-
 bool
 qemuDiskConfigBlkdeviotuneEnabled(virDomainDiskDef *disk);

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:44 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:44 +0200
Subject: [PATCH 66/80] qemu: command: Generate -drive for SD cards via JSON
 props
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <e5a7ae1d8708e26704b50ca47f8c4859f6d408cc.1658843187.git.pkrempa@redhat.com>

Since we know we have a modern qemu at hand which can interpret the
dotted syntax, we can format the -drive needed for SD cards via the
common infrastructure we have for all blockdev stuff.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 121 +++++++---------------------------------
 1 file changed, 20 insertions(+), 101 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index aec9e7415f..9fc3d91a42 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1789,44 +1789,6 @@ qemuDiskBusIsSD(int bus)
 }


-/**
- * qemuDiskSourceNeedsProps:
- * @src: disk source
- *
- * Returns true, if the disk source needs to be generated from the JSON
- * representation. Otherwise, the disk source should be represented using
- * the legacy representation.
- */
-static bool
-qemuDiskSourceNeedsProps(virStorageSource *src)
-{
-    virStorageType actualType = virStorageSourceGetActualType(src);
-
-    if (actualType == VIR_STORAGE_TYPE_NETWORK &&
-        src->protocol == VIR_STORAGE_NET_PROTOCOL_GLUSTER &&
-        src->nhosts > 1)
-        return true;
-
-    if (actualType == VIR_STORAGE_TYPE_NETWORK &&
-        src->protocol == VIR_STORAGE_NET_PROTOCOL_VXHS)
-        return true;
-
-    if (actualType == VIR_STORAGE_TYPE_NETWORK &&
-        src->protocol == VIR_STORAGE_NET_PROTOCOL_ISCSI)
-        return true;
-
-    if (actualType == VIR_STORAGE_TYPE_NETWORK &&
-        src->protocol == VIR_STORAGE_NET_PROTOCOL_NBD &&
-        src->haveTLS == VIR_TRISTATE_BOOL_YES)
-        return true;
-
-    if (actualType == VIR_STORAGE_TYPE_NVME)
-        return true;
-
-    return false;
-}
-
-
 /**
  * qemuDiskSourceGetProps:
  * @src: disk source struct
@@ -1851,73 +1813,24 @@ qemuDiskSourceGetProps(virStorageSource *src)
 }


-static int
-qemuBuildDriveSourcePR(virBuffer *buf,
-                       virDomainDiskDef *disk)
-{
-    g_autofree char *alias = NULL;
-    const char *defaultAlias = NULL;
-
-    if (!disk->src->pr)
-        return 0;
-
-    if (virStoragePRDefIsManaged(disk->src->pr))
-        defaultAlias = qemuDomainGetManagedPRAlias();
-    else if (!(alias = qemuDomainGetUnmanagedPRAlias(disk->info.alias)))
-        return -1;
-
-
-    virBufferAsprintf(buf, ",file.pr-manager=%s", alias ? alias : defaultAlias);
-    return 0;
-}
-
-
 static int
 qemuBuildDriveSourceStr(virDomainDiskDef *disk,
                         virBuffer *buf)
 {
     virStorageType actualType = virStorageSourceGetActualType(disk->src);
     qemuDomainStorageSourcePrivate *srcpriv = QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
-    qemuDomainSecretInfo *secinfo = NULL;
     qemuDomainSecretInfo *encinfo = NULL;
     g_autoptr(virJSONValue) srcprops = NULL;
-    g_autofree char *source = NULL;
     bool rawluks = false;

-    if (srcpriv) {
-        secinfo = srcpriv->secinfo;
+    if (srcpriv)
         encinfo = srcpriv->encinfo;
-    }
-
-    if (qemuDiskSourceNeedsProps(disk->src) &&
-        !(srcprops = qemuDiskSourceGetProps(disk->src)))
-        return -1;
-
-    if (!srcprops &&
-        qemuGetDriveSourceString(disk->src, secinfo, &source) < 0)
-        return -1;
-
-    /* nothing to format if the drive is empty */
-    if (!(source || srcprops) ||
-        ((disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY ||
-          disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM) &&
-         disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN)) {
-        return 0;
-    }

-    if (actualType == VIR_STORAGE_TYPE_BLOCK &&
-        disk->tray_status == VIR_DOMAIN_DISK_TRAY_OPEN) {
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       disk->src->type == VIR_STORAGE_TYPE_VOLUME ?
-                       _("tray status 'open' is invalid for block type volume") :
-                       _("tray status 'open' is invalid for block type disk"));
-        return -1;
-    }
-
-    if (source) {
+    switch (actualType) {
+    case VIR_STORAGE_TYPE_BLOCK:
+    case VIR_STORAGE_TYPE_FILE:
+    case VIR_STORAGE_TYPE_DIR:
         virBufferAddLit(buf, "file=");
-
-        /* for now the DIR based storage is handled by the magic FAT format */
         if (actualType == VIR_STORAGE_TYPE_DIR) {
             virBufferAddLit(buf, "fat:");

@@ -1925,21 +1838,27 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk,
                 virBufferAddLit(buf, "floppy:");
         }

-        virQEMUBuildBufferEscapeComma(buf, source);
-
-        if (secinfo)
-            virBufferAsprintf(buf, ",file.password-secret=%s", secinfo->alias);
-
-        if (disk->src->debug)
-            virBufferAsprintf(buf, ",file.debug=%d", disk->src->debugLevel);
+        virQEMUBuildBufferEscapeComma(buf, disk->src->path);
+        break;

-        if (qemuBuildDriveSourcePR(buf, disk) < 0)
+    case VIR_STORAGE_TYPE_NETWORK:
+        if (!(srcprops = qemuDiskSourceGetProps(disk->src)))
             return -1;
-    } else {
+
         if (virQEMUBuildCommandLineJSON(srcprops, buf, NULL,
                                         virQEMUBuildCommandLineJSONArrayNumbered) < 0)
             return -1;
+        break;
+
+    case VIR_STORAGE_TYPE_VOLUME:
+    case VIR_STORAGE_TYPE_NVME:
+    case VIR_STORAGE_TYPE_VHOST_USER:
+    case VIR_STORAGE_TYPE_NONE:
+    case VIR_STORAGE_TYPE_LAST:
+        break;
     }
+
+
     virBufferAddLit(buf, ",");

     if (encinfo) {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:47 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:47 +0200
Subject: [PATCH 69/80] qemuDomainSecretStorageSourcePrepare: Remove
 cabapbility check when preparing cookies
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <8b0c045dbcb5e4b4cb93a777e4a8d95ed05e5f95.1658843187.git.pkrempa@redhat.com>

The capability is checked when we validate the source in the first
place. Also it won't make sense any more.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 32319c1503..fb29135179 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1322,7 +1322,6 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPrivate *priv,
     }

     if (src->ncookies &&
-        virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
         !(srcPriv->httpcookie = qemuDomainSecretStorageSourcePrepareCookies(priv,
                                                                             src,
                                                                             aliasprotocol)))
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:49 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:49 +0200
Subject: [PATCH 71/80] qemuDomainDiskGetBackendAlias: Assume
 QEMU_CAPS_BLOCKDEV is supported
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <6e495907f0fc92ca2ee7e7f7cd4f925985437bf4.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c |  2 +-
 src/qemu/qemu_domain.c  | 11 ++++-------
 src/qemu/qemu_domain.h  |  4 +---
 src/qemu/qemu_hotplug.c |  2 +-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index a8c954edf6..afdf79ff55 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1935,7 +1935,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
     if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
         chardev = qemuDomainGetVhostUserChrAlias(disk->info.alias);
     } else {
-        if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &drive) < 0)
+        if (qemuDomainDiskGetBackendAlias(disk, &drive) < 0)
             return NULL;
     }

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8999f58d20..8997041b34 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7802,7 +7802,8 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
  * 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.
+ * This must be used only with disks instantiated via -blockdev (thus not
+ * for SD cards).
  */
 const char *
 qemuDomainDiskGetTopNodename(virDomainDiskDef *disk)
@@ -7822,7 +7823,6 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk)
 /**
  * qemuDomainDiskGetBackendAlias:
  * @disk: disk definition
- * @qemuCaps: emulator capabilities
  * @backendAlias: filled with the alias of the disk storage backend
  *
  * Returns the correct alias for the disk backend. This may be the alias of
@@ -7835,13 +7835,11 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk)
  */
 int
 qemuDomainDiskGetBackendAlias(virDomainDiskDef *disk,
-                              virQEMUCaps *qemuCaps,
                               char **backendAlias)
 {
     *backendAlias = NULL;

-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV) ||
-        qemuDiskBusIsSD(disk->bus)) {
+    if (qemuDiskBusIsSD(disk->bus)) {
         if (!(*backendAlias = qemuAliasDiskDriveFromDisk(disk)))
             return -1;

@@ -10961,8 +10959,7 @@ qemuDomainPrepareDiskSource(virDomainDiskDef *disk,
             disk->src->format = VIR_STORAGE_FILE_RAW;
     }

-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        !qemuDiskBusIsSD(disk->bus)) {
+    if (!qemuDiskBusIsSD(disk->bus)) {
         if (qemuDomainPrepareDiskSourceBlockdev(disk, priv, cfg) < 0)
             return -1;
     } else {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index b674d49207..7dc720dcb8 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -734,10 +734,8 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk)
     ATTRIBUTE_NONNULL(1);

 int qemuDomainDiskGetBackendAlias(virDomainDiskDef *disk,
-                                  virQEMUCaps *qemuCaps,
                                   char **backendAlias)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2)
-    ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT;
+    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;

 int qemuDomainStorageSourceChainAccessAllow(virQEMUDriver *driver,
                                             virDomainObj *vm,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index a752702fc4..afc9d299f5 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -480,7 +480,7 @@ qemuDomainChangeMediaBlockdev(virQEMUDriver *driver,
         if (!(newbackend = qemuBuildStorageSourceChainAttachPrepareBlockdev(newsrc)))
             return -1;

-        if (qemuDomainDiskGetBackendAlias(disk, priv->qemuCaps, &nodename) < 0)
+        if (qemuDomainDiskGetBackendAlias(disk, &nodename) < 0)
             return -1;
     }

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:50 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:50 +0200
Subject: [PATCH 72/80] qemuDomainValidateStorageSource: Remove
 QEMU_CAPS_BLOCKDEV validation
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <6e9f6b56bdf57d8e6a058c4f7d736b645cc84f43.1658843187.git.pkrempa@redhat.com>

While we assume that -blockdev is supported the validator had also some
corner cases for -drive. Since we use '-drive' exclusively for the
extremely rarely used SD cards it makes no sense to have the validation.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 60 +++---------------------------------------
 1 file changed, 3 insertions(+), 57 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8997041b34..0839744660 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4811,13 +4811,9 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net,
 int
 qemuDomainValidateStorageSource(virStorageSource *src,
                                 virQEMUCaps *qemuCaps,
-                                bool maskBlockdev)
+                                bool maskBlockdev G_GNUC_UNUSED)
 {
     virStorageType actualType = virStorageSourceGetActualType(src);
-    bool blockdev = virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV);
-
-    if (maskBlockdev)
-        blockdev = false;

     if (src->format == VIR_STORAGE_FILE_COW) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -4870,17 +4866,6 @@ qemuDomainValidateStorageSource(virStorageSource *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 && !blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("storage slice is not supported by this QEMU binary"));
-            return -1;
-        }
-    }
-
     if (src->sslverify != VIR_TRISTATE_BOOL_ABSENT) {
         if (actualType != VIR_STORAGE_TYPE_NETWORK ||
             (src->protocol != VIR_STORAGE_NET_PROTOCOL_HTTPS &&
@@ -4889,12 +4874,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
                            _("ssl verification is supported only with HTTPS/FTPS protocol"));
             return -1;
         }
-
-        if (!src->detected && !blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("ssl verification setting is not supported by this QEMU binary"));
-            return -1;
-        }
     }

     if (src->ncookies > 0) {
@@ -4906,12 +4885,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
             return -1;
         }

-        if (!src->detected && !blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("http cookies are not supported by this QEMU binary"));
-            return -1;
-        }
-
         if (virStorageSourceNetCookiesValidate(src) < 0)
             return -1;
     }
@@ -4926,12 +4899,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
                            _("readahead is supported only with HTTP(S)/FTP(s) protocols"));
             return -1;
         }
-
-        if (!src->detected && !blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("readahead setting is not supported with this QEMU binary"));
-            return -1;
-        }
     }

     if (src->timeout > 0) {
@@ -4944,12 +4911,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
                            _("timeout is supported only with HTTP(S)/FTP(s) protocols"));
             return -1;
         }
-
-        if (!src->detected && !blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("timeout setting is not supported with this QEMU binary"));
-            return -1;
-        }
     }

     if (src->query &&
@@ -4961,11 +4922,9 @@ qemuDomainValidateStorageSource(virStorageSource *src,
         return -1;
     }

-    /* TFTP protocol was not supported for some time, lock it out at least with
-     * -blockdev */
+    /* TFTP protocol was not supported */
     if (actualType == VIR_STORAGE_TYPE_NETWORK &&
-        src->protocol == VIR_STORAGE_NET_PROTOCOL_TFTP &&
-        blockdev) {
+        src->protocol == VIR_STORAGE_NET_PROTOCOL_TFTP) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("'tftp' protocol is not supported with this QEMU binary"));
         return -1;
@@ -4973,13 +4932,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,

     if (actualType == VIR_STORAGE_TYPE_NETWORK &&
         src->protocol == VIR_STORAGE_NET_PROTOCOL_NFS) {
-        /* NFS protocol may only be used if current QEMU supports blockdev */
-        if (!blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("'nfs' protocol is not supported with this QEMU binary"));
-            return -1;
-        }
-
         /* NFS protocol must have exactly one host */
         if (src->nhosts != 1) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -5009,12 +4961,6 @@ qemuDomainValidateStorageSource(virStorageSource *src,
                            _("metadata cache max size control is supported only with qcow2 images"));
             return -1;
         }
-
-        if (!blockdev) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                           _("metadata cache max size control is not supported with this QEMU binary"));
-            return -1;
-        }
     }

     if (src->encryption) {
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:52 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:52 +0200
Subject: [PATCH 74/80] qemuDomainDetermineDiskChain: Assume QEMU_CAPS_BLOCKDEV
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <441c8fea36db2d1bfddd563da7da065718b6b8ae.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8ac99a8cf7..d372381c74 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7635,8 +7635,6 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
     virStorageSource *src; /* iterator for the backing chain declared in XML */
     virStorageSource *n; /* iterator for the backing chain detected from disk */
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
-    bool isSD = qemuDiskBusIsSD(disk->bus);
     uid_t uid;
     gid_t gid;

@@ -7726,7 +7724,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
         qemuDomainPrepareStorageSourceConfig(n, cfg);
         qemuDomainPrepareDiskSourceData(disk, n);

-        if (blockdev && !isSD &&
+        if (!qemuDiskBusIsSD(disk->bus) &&
             qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0)
             return -1;
     }
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:41 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:41 +0200
Subject: [PATCH 63/80] qemu: block: Remove support for legacy disk
 hotplug/unplug
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <9b6521a5109aab5ae193efffbd70074266a3ff52.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_block.c   | 14 --------------
 src/qemu/qemu_block.h   |  2 --
 src/qemu/qemu_command.c |  3 +--
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
index afdcca2813..f504d8bc4c 100644
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -1304,7 +1304,6 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachData *data)
     g_free(data->encryptsecretAlias);
     g_free(data->httpcookiesecretAlias);
     g_free(data->driveCmd);
-    g_free(data->driveAlias);
     g_free(data->chardevAlias);
     g_free(data);
 }
@@ -1472,13 +1471,6 @@ qemuBlockStorageSourceAttachApply(qemuMonitor *mon,
         qemuBlockStorageSourceAttachApplyFormat(mon, data) < 0)
         return -1;

-    if (data->driveCmd) {
-        if (qemuMonitorAddDrive(mon, data->driveCmd) < 0)
-            return -1;
-
-        data->driveAdded = true;
-    }
-
     if (data->chardevDef) {
         if (qemuMonitorAttachCharDev(mon, data->chardevAlias, data->chardevDef) < 0)
             return -1;
@@ -1515,12 +1507,6 @@ qemuBlockStorageSourceAttachRollback(qemuMonitor *mon,
         }
     }

-    if (data->driveAdded) {
-        if (qemuMonitorDriveDel(mon, data->driveAlias) < 0)
-            VIR_WARN("Unable to remove drive %s (%s) after failed 'device_add'",
-                     data->driveAlias, data->driveCmd);
-    }
-
     if (data->formatAttached)
         ignore_value(qemuMonitorBlockdevDel(mon, data->formatNodeName));

diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
index d29d444a5a..b083b7565e 100644
--- a/src/qemu/qemu_block.h
+++ b/src/qemu/qemu_block.h
@@ -81,8 +81,6 @@ struct qemuBlockStorageSourceAttachData {
     bool formatAttached;

     char *driveCmd;
-    char *driveAlias;
-    bool driveAdded;

     virDomainChrSourceDef *chardevDef;
     char *chardevAlias;
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index ed718eb81b..865464a772 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10624,8 +10624,7 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDef *disk)

     data = g_new0(qemuBlockStorageSourceAttachData, 1);

-    if (!(data->driveCmd = qemuBuildDriveStr(disk)) ||
-        !(data->driveAlias = qemuAliasDiskDriveFromDisk(disk)))
+    if (!(data->driveCmd = qemuBuildDriveStr(disk)))
         return NULL;

     return g_steal_pointer(&data);
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:54 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:54 +0200
Subject: [PATCH 76/80] qemu: Setup disk throttling for SD cards via monitor
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <fb231f97c2a5e9c56ca35f551972da4fa040ca4d.1658843187.git.pkrempa@redhat.com>

Set it same way we set throttling for other disks in
qemuProcessSetupDiskThrottling.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 42 -----------------------------------------
 src/qemu/qemu_process.c | 20 +++++++++++---------
 2 files changed, 11 insertions(+), 51 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index afdf79ff55..6b93c5f579 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1676,46 +1676,6 @@ qemuBuildDriveSourceStr(virDomainDiskDef *disk,
 }


-static void
-qemuBuildDiskThrottling(virDomainDiskDef *disk,
-                        virBuffer *buf)
-{
-#define IOTUNE_ADD(_field, _label) \
-    if (disk->blkdeviotune._field) { \
-        virBufferAsprintf(buf, ",throttling." _label "=%llu", \
-                          disk->blkdeviotune._field); \
-    }
-
-    IOTUNE_ADD(total_bytes_sec, "bps-total");
-    IOTUNE_ADD(read_bytes_sec, "bps-read");
-    IOTUNE_ADD(write_bytes_sec, "bps-write");
-    IOTUNE_ADD(total_iops_sec, "iops-total");
-    IOTUNE_ADD(read_iops_sec, "iops-read");
-    IOTUNE_ADD(write_iops_sec, "iops-write");
-
-    IOTUNE_ADD(total_bytes_sec_max, "bps-total-max");
-    IOTUNE_ADD(read_bytes_sec_max, "bps-read-max");
-    IOTUNE_ADD(write_bytes_sec_max, "bps-write-max");
-    IOTUNE_ADD(total_iops_sec_max, "iops-total-max");
-    IOTUNE_ADD(read_iops_sec_max, "iops-read-max");
-    IOTUNE_ADD(write_iops_sec_max, "iops-write-max");
-
-    IOTUNE_ADD(size_iops_sec, "iops-size");
-    if (disk->blkdeviotune.group_name) {
-        virBufferAddLit(buf, ",throttling.group=");
-        virQEMUBuildBufferEscapeComma(buf, disk->blkdeviotune.group_name);
-    }
-
-    IOTUNE_ADD(total_bytes_sec_max_length, "bps-total-max-length");
-    IOTUNE_ADD(read_bytes_sec_max_length, "bps-read-max-length");
-    IOTUNE_ADD(write_bytes_sec_max_length, "bps-write-max-length");
-    IOTUNE_ADD(total_iops_sec_max_length, "iops-total-max-length");
-    IOTUNE_ADD(read_iops_sec_max_length, "iops-read-max-length");
-    IOTUNE_ADD(write_iops_sec_max_length, "iops-write-max-length");
-#undef IOTUNE_ADD
-}
-
-
 static void
 qemuBuildDiskGetErrorPolicy(virDomainDiskDef *disk,
                             const char **wpolicy,
@@ -1790,8 +1750,6 @@ qemuBuildDriveStr(virDomainDiskDef *disk)
         }
     }

-    qemuBuildDiskThrottling(disk, &opt);
-
     return virBufferContentAndReset(&opt);
 }

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ac463571bb..f15222e932 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -7220,7 +7220,7 @@ qemuProcessGenID(virDomainObj *vm,


 /**
- * qemuProcessSetupDiskThrottlingBlockdev:
+ * qemuProcessSetupDiskThrottling:
  *
  * Sets up disk trottling for -blockdev via block_set_io_throttle monitor
  * command. This hack should be replaced by proper use of the 'throttle'
@@ -7228,9 +7228,9 @@ qemuProcessGenID(virDomainObj *vm,
  * Same hack is done in qemuDomainAttachDiskGeneric.
  */
 static int
-qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriver *driver,
-                                       virDomainObj *vm,
-                                       virDomainAsyncJob asyncJob)
+qemuProcessSetupDiskThrottling(virQEMUDriver *driver,
+                               virDomainObj *vm,
+                               virDomainAsyncJob asyncJob)
 {
     size_t i;
     int ret = -1;
@@ -7243,10 +7243,12 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriver *driver,
     for (i = 0; i < vm->def->ndisks; i++) {
         virDomainDiskDef *disk = vm->def->disks[i];
         qemuDomainDiskPrivate *diskPriv = QEMU_DOMAIN_DISK_PRIVATE(disk);
+        g_autofree char *drivealias = NULL;

-        /* sd-cards are instantiated via -drive */
-        if (qemuDiskBusIsSD(disk->bus))
-            continue;
+        if (!QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
+            if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
+                goto cleanup;
+        }

         /* Setting throttling for empty drives fails */
         if (virStorageSourceIsEmpty(disk->src))
@@ -7255,7 +7257,7 @@ qemuProcessSetupDiskThrottlingBlockdev(virQEMUDriver *driver,
         if (!qemuDiskConfigBlkdeviotuneEnabled(disk))
             continue;

-        if (qemuMonitorSetBlockIoThrottle(qemuDomainGetMonitor(vm), NULL,
+        if (qemuMonitorSetBlockIoThrottle(qemuDomainGetMonitor(vm), drivealias,
                                           diskPriv->qomName, &disk->blkdeviotune) < 0)
             goto cleanup;
     }
@@ -7768,7 +7770,7 @@ qemuProcessLaunch(virConnectPtr conn,
     if (qemuProcessSetupBalloon(driver, vm, asyncJob) < 0)
         goto cleanup;

-    if (qemuProcessSetupDiskThrottlingBlockdev(driver, vm, asyncJob) < 0)
+    if (qemuProcessSetupDiskThrottling(driver, vm, asyncJob) < 0)
         goto cleanup;

     /* Since CPUs were not started yet, the balloon could not return the memory
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:48 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:48 +0200
Subject: [PATCH 70/80] qemuDomainDiskBlockJobIsSupported: Assume
 QEMU_CAPS_BLOCKDEV is supported
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <e4bcf8d630a51d78de6d0be1e884496f494c0914.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_backup.c     |  2 +-
 src/qemu/qemu_checkpoint.c |  2 +-
 src/qemu/qemu_domain.c     | 10 +++-------
 src/qemu/qemu_domain.h     |  3 +--
 src/qemu/qemu_driver.c     |  6 +++---
 src/qemu/qemu_snapshot.c   | 13 +++++--------
 6 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index b90185a375..60cb79d70d 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -260,7 +260,7 @@ qemuBackupDiskPrepareDataOne(virDomainObj *vm,
         return -1;
     }

-    if (!qemuDomainDiskBlockJobIsSupported(vm, dd->domdisk))
+    if (!qemuDomainDiskBlockJobIsSupported(dd->domdisk))
         return -1;

     if (dd->store->format == VIR_STORAGE_FILE_NONE) {
diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c
index 933ea41023..98e1a94def 100644
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -372,7 +372,7 @@ qemuCheckpointPrepare(virQEMUDriver *driver,
             return -1;
         }

-        if (!qemuDomainDiskBlockJobIsSupported(vm, vm->def->disks[i]))
+        if (!qemuDomainDiskBlockJobIsSupported(vm->def->disks[i]))
             return -1;
     }

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index fb29135179..8999f58d20 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11349,19 +11349,15 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
 /**
  * qemuDomainDiskBlockJobIsSupported:
  *
- * Returns true if block jobs are supported on @disk by @vm or false and reports
+ * Returns true if block jobs are supported on @disk orfalse and reports
  * an error otherwise.
  *
  * Note that this does not verify whether other block jobs are running etc.
  */
 bool
-qemuDomainDiskBlockJobIsSupported(virDomainObj *vm,
-                                  virDomainDiskDef *disk)
+qemuDomainDiskBlockJobIsSupported(virDomainDiskDef *disk)
 {
-    qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        qemuDiskBusIsSD(disk->bus)) {
+    if (qemuDiskBusIsSD(disk->bus)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("block jobs are not supported on disk '%s' using bus 'sd'"),
                        disk->dst);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 66188ed003..b674d49207 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1054,8 +1054,7 @@ qemuDomainInitializePflashStorageSource(virDomainObj *vm,
                                         virQEMUDriverConfig *cfg);

 bool
-qemuDomainDiskBlockJobIsSupported(virDomainObj *vm,
-                                  virDomainDiskDef *disk);
+qemuDomainDiskBlockJobIsSupported(virDomainDiskDef *disk);

 int
 qemuDomainDefNumaCPUsRectify(virDomainDef *def,
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1ecc9a71b3..4c3e12966a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -14482,7 +14482,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm,
     if (qemuDomainDiskBlockJobIsActive(disk))
         goto endjob;

-    if (!qemuDomainDiskBlockJobIsSupported(vm, disk))
+    if (!qemuDomainDiskBlockJobIsSupported(disk))
         goto endjob;

     if (base &&
@@ -15015,7 +15015,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     if (qemuDomainDiskBlockJobIsActive(disk))
         goto endjob;

-    if (!qemuDomainDiskBlockJobIsSupported(vm, disk))
+    if (!qemuDomainDiskBlockJobIsSupported(disk))
         goto endjob;

     if (disk->device == VIR_DOMAIN_DISK_DEVICE_LUN &&
@@ -15484,7 +15484,7 @@ qemuDomainBlockCommit(virDomainPtr dom,
     if (!(disk = qemuDomainDiskByName(vm->def, path)))
         goto endjob;

-    if (!qemuDomainDiskBlockJobIsSupported(vm, disk))
+    if (!qemuDomainDiskBlockJobIsSupported(disk))
         goto endjob;

     if (virStorageSourceIsEmpty(disk->src)) {
diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index b96ef7a50b..f52f705cb1 100644
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -447,8 +447,7 @@ qemuSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDef *snapdisk,


 static int
-qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
-                                      virDomainSnapshotDiskDef *snapdisk,
+qemuSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDef *snapdisk,
                                       virDomainDiskDef *domdisk)
 {
     virStorageType actualType = virStorageSourceGetActualType(snapdisk->src);
@@ -463,7 +462,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,
         return -1;
     }

-    if (!qemuDomainDiskBlockJobIsSupported(vm, domdisk))
+    if (!qemuDomainDiskBlockJobIsSupported(domdisk))
         return -1;

     switch (actualType) {
@@ -492,8 +491,7 @@ qemuSnapshotPrepareDiskExternalActive(virDomainObj *vm,


 static int
-qemuSnapshotPrepareDiskExternal(virDomainObj *vm,
-                                virDomainDiskDef *disk,
+qemuSnapshotPrepareDiskExternal(virDomainDiskDef *disk,
                                 virDomainSnapshotDiskDef *snapdisk,
                                 bool active,
                                 bool reuse)
@@ -508,7 +506,7 @@ qemuSnapshotPrepareDiskExternal(virDomainObj *vm,
         if (qemuSnapshotPrepareDiskExternalInactive(snapdisk, disk) < 0)
             return -1;
     } else {
-        if (qemuSnapshotPrepareDiskExternalActive(vm, snapdisk, disk) < 0)
+        if (qemuSnapshotPrepareDiskExternalActive(snapdisk, disk) < 0)
             return -1;
     }

@@ -701,8 +699,7 @@ qemuSnapshotPrepare(virDomainObj *vm,
                 }
             }

-            if (qemuSnapshotPrepareDiskExternal(vm, dom_disk, disk,
-                                                active, reuse) < 0)
+            if (qemuSnapshotPrepareDiskExternal(dom_disk, disk, active, reuse) < 0)
                 return -1;

             external++;
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:55 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:55 +0200
Subject: [PATCH 77/80] qemu: capabilities: Retire
 QEMU_CAPS_QUERY_NAMED_BLOCK_NODES
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <1e26d25da1e02f5a896ba92c481c5f11a791033f.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 28 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 7342eb3596..d0fbe8d7f8 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -416,7 +416,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "block-write-threshold", /* QEMU_CAPS_BLOCK_WRITE_THRESHOLD */

               /* 250 */
-              "query-named-block-nodes", /* QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
+              "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
               "cpu-cache", /* QEMU_CAPS_CPU_CACHE */
               "qemu-xhci", /* QEMU_CAPS_DEVICE_QEMU_XHCI */
               "kernel-irqchip", /* X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP */
@@ -1210,7 +1210,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
     { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS },
     { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION },
     { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS },
-    { "query-named-block-nodes", QEMU_CAPS_QUERY_NAMED_BLOCK_NODES },
     { "query-cpus-fast", QEMU_CAPS_QUERY_CPUS_FAST },
     { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES },
     { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f8d4d3df05..d06a7e6751 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -395,7 +395,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */

     /* 250 */
-    QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
+    X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
     QEMU_CAPS_CPU_CACHE, /* -cpu supports host-cache-info and l3-cache properties */
     QEMU_CAPS_DEVICE_QEMU_XHCI, /* -device qemu-xhci */
     X_QEMU_CAPS_MACHINE_KERNEL_IRQCHIP, /* -machine kernel_irqchip */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 2928f00c67..e285dd4899 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -89,7 +89,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 7dc9b425ae..22a441e9c6 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -85,7 +85,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 2ff0e9f8df..19c38fe572 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -53,7 +53,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 744356169f..338ab4f925 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -115,7 +115,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index f4e9e68dd0..c975dc1f27 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -91,7 +91,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 3aeac68121..dda389f637 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -87,7 +87,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c1e72e3d9e..39650685a5 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -90,7 +90,6 @@
   <flag name='spice-rendernode'/>
   <flag name='pcie-root-port'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index bebdf2ea75..b6dd2db3c0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -115,7 +115,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 46d6932662..095a036ef5 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -29,7 +29,6 @@
   <flag name='query-hotpluggable-cpus'/>
   <flag name='spice-rendernode'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='chardev-reconnect'/>
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 3ac32468f5..3b1c85d760 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -115,7 +115,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 0c20e6c535..d617366402 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -91,7 +91,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index c5ddbb1d09..e1ac1c645c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -86,7 +86,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 98b02aa2da..ba46833b94 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -89,7 +89,6 @@
   <flag name='spice-rendernode'/>
   <flag name='pcie-root-port'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 5244458ebf..290f423cd5 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -52,7 +52,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 0824e37c24..02aac89249 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -115,7 +115,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 2e0bb0a374..58c19cdcd8 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -92,7 +92,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 1a17bb6dfd..cd468e2a5e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -52,7 +52,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 75eda4d489..d462be83f9 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -114,7 +114,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 4943e0dc94..94eb08aae6 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -113,7 +113,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index eb5ba3786e..10c5efd07a 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -99,7 +99,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 82c38be8a6..d9f644e797 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -86,7 +86,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 58224325e5..bb51d7bca3 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -113,7 +113,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 7848f4aca4..68526f345e 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -99,7 +99,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index c6c946f758..524b692784 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -92,7 +92,6 @@
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
   <flag name='block-write-threshold'/>
-  <flag name='query-named-block-nodes'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 0af79c8ea6..f9f55d61bb 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -113,7 +113,6 @@
   <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='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 558507c573..3e45438116 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -113,7 +113,6 @@
   <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='intel-iommu.intremap'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:56 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:56 +0200
Subject: [PATCH 78/80] qemu: Assume support and retire
 QEMU_CAPS_BLOCK_WRITE_THRESHOLD
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <85ed235f59a29b39dc9743708d7b992d8c991842.1658843187.git.pkrempa@redhat.com>

The event was introduced in qemu-2.3

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 3 +--
 src/qemu/qemu_capabilities.h                      | 2 +-
 src/qemu/qemu_driver.c                            | 6 ------
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 29 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d0fbe8d7f8..1caae40d0f 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -413,7 +413,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "nvdimm", /* QEMU_CAPS_DEVICE_NVDIMM */
               "pcie-root-port", /* QEMU_CAPS_DEVICE_PCIE_ROOT_PORT */
               "query-cpu-definitions", /* QEMU_CAPS_QUERY_CPU_DEFINITIONS */
-              "block-write-threshold", /* QEMU_CAPS_BLOCK_WRITE_THRESHOLD */
+              "block-write-threshold", /* X_QEMU_CAPS_BLOCK_WRITE_THRESHOLD */

               /* 250 */
               "query-named-block-nodes", /* X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES */
@@ -1233,7 +1233,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
 /* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */
 struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
     { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
-    { "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD },
     { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED },
 };

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index d06a7e6751..097ecdca32 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -392,7 +392,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_NVDIMM, /* -device nvdimm */
     QEMU_CAPS_DEVICE_PCIE_ROOT_PORT, /* -device pcie-root-port */
     QEMU_CAPS_QUERY_CPU_DEFINITIONS, /* qmp query-cpu-definitions */
-    QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */
+    X_QEMU_CAPS_BLOCK_WRITE_THRESHOLD, /* BLOCK_WRITE_THRESHOLD event */

     /* 250 */
     X_QEMU_CAPS_QUERY_NAMED_BLOCK_NODES, /* qmp query-named-block-nodes */
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4c3e12966a..8c7cb64f98 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19632,12 +19632,6 @@ qemuDomainSetBlockThreshold(virDomainPtr dom,
     if (virDomainObjCheckActive(vm) < 0)
         goto endjob;

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCK_WRITE_THRESHOLD)) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("this qemu does not support setting device threshold"));
-        goto endjob;
-    }
-
     if (!(src = qemuDomainGetStorageSourceByDevstr(dev, vm->def, priv->backup)))
         goto endjob;

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index e285dd4899..ed59536bd7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -88,7 +88,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 22a441e9c6..8adc5e8335 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -84,7 +84,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 19c38fe572..41abf5474a 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -52,7 +52,6 @@
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 338ab4f925..6af25c80f7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -114,7 +114,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index c975dc1f27..77983f4d19 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -90,7 +90,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index dda389f637..e0d01288e6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -86,7 +86,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 39650685a5..9fc0898622 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -89,7 +89,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='spice-rendernode'/>
   <flag name='pcie-root-port'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index b6dd2db3c0..c893649c9a 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -114,7 +114,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 095a036ef5..9d7effca30 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -28,7 +28,6 @@
   <flag name='chardev-logfile'/>
   <flag name='query-hotpluggable-cpus'/>
   <flag name='spice-rendernode'/>
-  <flag name='block-write-threshold'/>
   <flag name='chardev-reconnect'/>
   <flag name='disk-share-rw'/>
   <flag name='isa-serial'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 3b1c85d760..c965dff81c 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -114,7 +114,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index d617366402..a9d87bc33d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -90,7 +90,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index e1ac1c645c..ca8d47a534 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -85,7 +85,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index ba46833b94..6df5dd097c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -88,7 +88,6 @@
   <flag name='virtio-net.host_mtu'/>
   <flag name='spice-rendernode'/>
   <flag name='pcie-root-port'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 290f423cd5..d03456bc07 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -51,7 +51,6 @@
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 02aac89249..59f68dfb3a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -114,7 +114,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 58c19cdcd8..045303ae71 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -91,7 +91,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index cd468e2a5e..cdabb03f8e 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -51,7 +51,6 @@
   <flag name='query-cpu-model-expansion'/>
   <flag name='virtio-net.host_mtu'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='loadparm'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index d462be83f9..d8ea781430 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -113,7 +113,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 94eb08aae6..00cd48bdb1 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -112,7 +112,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 10c5efd07a..b16318bb16 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -98,7 +98,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index d9f644e797..31791cf643 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -85,7 +85,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index bb51d7bca3..63011661ae 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -112,7 +112,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 68526f345e..ba401e00b2 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -98,7 +98,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='virtio-net.tx_queue_size'/>
   <flag name='chardev-reconnect'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 524b692784..b0cb53021d 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -91,7 +91,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='qemu-xhci'/>
   <flag name='spapr-pci-host-bridge'/>
   <flag name='spapr-pci-host-bridge.numa_node'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index f9f55d61bb..f451bc9892 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -112,7 +112,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 3e45438116..31cca6f052 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -112,7 +112,6 @@
   <flag name='nvdimm'/>
   <flag name='pcie-root-port'/>
   <flag name='query-cpu-definitions'/>
-  <flag name='block-write-threshold'/>
   <flag name='cpu-cache'/>
   <flag name='qemu-xhci'/>
   <flag name='intel-iommu.intremap'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:51 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:51 +0200
Subject: [PATCH 73/80] qemuDomainValidateStorageSource: Remove 'maskBlockdev'
 argument
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <97bb325b7865dee26df5e9bfac2c73a87cae52e8.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c   | 10 ++++------
 src/qemu/qemu_domain.h   |  3 +--
 src/qemu/qemu_validate.c |  6 ++----
 tests/qemublocktest.c    |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0839744660..8ac99a8cf7 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4810,8 +4810,7 @@ qemuDomainValidateActualNetDef(const virDomainNetDef *net,

 int
 qemuDomainValidateStorageSource(virStorageSource *src,
-                                virQEMUCaps *qemuCaps,
-                                bool maskBlockdev G_GNUC_UNUSED)
+                                virQEMUCaps *qemuCaps)
 {
     virStorageType actualType = virStorageSourceGetActualType(src);

@@ -7721,8 +7720,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
         if (n->format == VIR_STORAGE_FILE_ISO)
             n->format = VIR_STORAGE_FILE_RAW;

-        /* mask-out blockdev for 'sd' disks */
-        if (qemuDomainValidateStorageSource(n, priv->qemuCaps, isSD) < 0)
+        if (qemuDomainValidateStorageSource(n, priv->qemuCaps) < 0)
             return -1;

         qemuDomainPrepareStorageSourceConfig(n, cfg);
@@ -10782,7 +10780,7 @@ qemuDomainPrepareDiskSourceLegacy(virDomainDiskDef *disk,
                                   qemuDomainObjPrivate *priv,
                                   virQEMUDriverConfig *cfg)
 {
-    if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps, true) < 0)
+    if (qemuDomainValidateStorageSource(disk->src, priv->qemuCaps) < 0)
         return -1;

     qemuDomainPrepareStorageSourceConfig(disk->src, cfg);
@@ -10820,7 +10818,7 @@ qemuDomainPrepareStorageSourceBlockdevNodename(virDomainDiskDef *disk,
     if (src->encryption && src->encryption->engine == VIR_STORAGE_ENCRYPTION_ENGINE_DEFAULT)
         src->encryption->engine = VIR_STORAGE_ENCRYPTION_ENGINE_QEMU;

-    if (qemuDomainValidateStorageSource(src, priv->qemuCaps, false) < 0)
+    if (qemuDomainValidateStorageSource(src, priv->qemuCaps) < 0)
         return -1;

     qemuDomainPrepareStorageSourceConfig(src, cfg);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 7dc720dcb8..abf245ec2a 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -997,8 +997,7 @@ qemuDomainPrepareDiskSourceData(virDomainDiskDef *disk,

 int
 qemuDomainValidateStorageSource(virStorageSource *src,
-                                virQEMUCaps *qemuCaps,
-                                bool maskBlockdev);
+                                virQEMUCaps *qemuCaps);


 int
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 4ce920152f..af93588e49 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -648,7 +648,7 @@ qemuValidateDomainDefNvram(const virDomainDef *def,
         return -1;
     }

-    if (qemuDomainValidateStorageSource(src, qemuCaps, false) < 0)
+    if (qemuDomainValidateStorageSource(src, qemuCaps) < 0)
         return -1;

     return 0;
@@ -3216,7 +3216,6 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskDef *disk,
                                 virQEMUCaps *qemuCaps)
 {
     const char *driverName = virDomainDiskGetDriver(disk);
-    bool isSD = qemuDiskBusIsSD(disk->bus);
     virStorageSource *n;
     int idx;
     int partition;
@@ -3259,8 +3258,7 @@ qemuValidateDomainDeviceDefDisk(const virDomainDiskDef *disk,
     }

     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
-        /* blockdev support is masked out for 'sd' disks */
-        if (qemuDomainValidateStorageSource(n, qemuCaps, isSD) < 0)
+        if (qemuDomainValidateStorageSource(n, qemuCaps) < 0)
             return -1;
     }

diff --git a/tests/qemublocktest.c b/tests/qemublocktest.c
index 57116c930b..1c1013d4d9 100644
--- a/tests/qemublocktest.c
+++ b/tests/qemublocktest.c
@@ -294,7 +294,7 @@ testQemuDiskXMLToProps(const void *opaque)
         if (testQemuDiskXMLToJSONFakeSecrets(n) < 0)
             return -1;

-        if (qemuDomainValidateStorageSource(n, data->qemuCaps, false) < 0)
+        if (qemuDomainValidateStorageSource(n, data->qemuCaps) < 0)
             return -1;

         qemuDomainPrepareDiskSourceData(disk, n);
@@ -519,7 +519,7 @@ testQemuImageCreate(const void *opaque)
     src->capacity = UINT_MAX * 2ULL;
     src->physical = UINT_MAX + 1ULL;

-    if (qemuDomainValidateStorageSource(src, data->qemuCaps, false) < 0)
+    if (qemuDomainValidateStorageSource(src, data->qemuCaps) < 0)
         return -1;

     if (qemuBlockStorageSourceCreateGetStorageProps(src, &protocolprops) < 0)
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:53 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:53 +0200
Subject: [PATCH 75/80] qemu: Retire QEMU_CAPS_BLOCKDEV
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <cbf78169a5e2a05ff7942700989103cf4e7c0409.1658843187.git.pkrempa@redhat.com>

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c                      | 13 +++++--------
 src/qemu/qemu_capabilities.h                      |  2 +-
 src/qemu/qemu_process.c                           | 10 ----------
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml |  1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   |  1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml |  1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   |  1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml |  1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   |  1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  |  1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  |  1 -
 tests/qemuhotplugtest.c                           |  1 -
 tests/testutilsqemu.c                             |  3 ---
 31 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b91f46bb12..7342eb3596 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -504,7 +504,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "usb-storage.werror", /* X_QEMU_CAPS_USB_STORAGE_WERROR */
               "egl-headless", /* QEMU_CAPS_EGL_HEADLESS */
               "vfio-pci.display", /* QEMU_CAPS_VFIO_PCI_DISPLAY */
-              "blockdev", /* QEMU_CAPS_BLOCKDEV */
+              "blockdev", /* X_QEMU_CAPS_BLOCKDEV */

               /* 315 */
               "vfio-ap", /* QEMU_CAPS_DEVICE_VFIO_AP */
@@ -5224,10 +5224,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
 static void
 virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
 {
-    /* While the removal of pre-blockdev code is in progress we always hard-code
-     * the support for QEMU_CAPS_BLOCKDEV */
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_BLOCKDEV);
-
     /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
      * should be built with gcrypt to achieve FIPS compliance
      * automatically / implicitly
@@ -6093,13 +6089,13 @@ struct virQEMUCapsDomainFeatureCapabilityTuple {

 /**
  * This maps the qemu features to the entries in <features> of the domain
- * capability XML.
+ * capability XML. Use QEMU_CAPS_LAST to always enable a domain feature.
  * */
 static const struct virQEMUCapsDomainFeatureCapabilityTuple domCapsTuples[] = {
     { VIR_DOMAIN_CAPS_FEATURE_IOTHREADS, QEMU_CAPS_OBJECT_IOTHREAD },
     { VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO, QEMU_CAPS_DEVICE_VMCOREINFO },
     { VIR_DOMAIN_CAPS_FEATURE_GENID, QEMU_CAPS_DEVICE_VMGENID },
-    { VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, QEMU_CAPS_BLOCKDEV },
+    { VIR_DOMAIN_CAPS_FEATURE_BACKING_STORE_INPUT, QEMU_CAPS_LAST },
     { VIR_DOMAIN_CAPS_FEATURE_BACKUP, QEMU_CAPS_INCREMENTAL_BACKUP },
 };

@@ -6111,7 +6107,8 @@ virQEMUCapsFillDomainFeaturesFromQEMUCaps(virQEMUCaps *qemuCaps,
     size_t i;

     for (i = 0; i < G_N_ELEMENTS(domCapsTuples); i++) {
-        if (virQEMUCapsGet(qemuCaps, domCapsTuples[i].qemucap))
+        if (virQEMUCapsGet(qemuCaps, domCapsTuples[i].qemucap) ||
+            domCapsTuples[i].qemucap == QEMU_CAPS_LAST)
             domCaps->features[domCapsTuples[i].domcap] = VIR_TRISTATE_BOOL_YES;
         else
             domCaps->features[domCapsTuples[i].domcap] = VIR_TRISTATE_BOOL_NO;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5f982b11d5..f8d4d3df05 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -483,7 +483,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     X_QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
     QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
     QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
-    QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */
+    X_QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */

     /* 315 */
     QEMU_CAPS_DEVICE_VFIO_AP, /* -device vfio-ap */
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f13664c7f2..ac463571bb 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5594,11 +5594,6 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
                 return -1;
             }

-            /* The code is being cleaned up to always assume the support for
-             * -blockdev thus we must no longer allow users to clear it */
-            if (tmp == QEMU_CAPS_BLOCKDEV)
-                continue;
-
             virQEMUCapsClear(priv->qemuCaps, tmp);
         }
     }
@@ -5623,11 +5618,6 @@ qemuProcessStartUpdateCustomCaps(virDomainObj *vm)
                 return -1;
             }

-            /* The code is being cleaned up to always assume the support for
-             * -blockdev thus we must no longer allow users to clear it */
-            if (tmp == QEMU_CAPS_BLOCKDEV)
-                continue;
-
             virQEMUCapsClear(priv->qemuCaps, tmp);
         }
     }
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 419a987068..2928f00c67 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -111,7 +111,6 @@
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index ceaedd3863..7dc9b425ae 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -111,7 +111,6 @@
   <flag name='machine.pseries.cap-htm'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index d1ed2a781c..2ff0e9f8df 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -79,7 +79,6 @@
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 784a837e91..744356169f 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -147,7 +147,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index b67c55b192..f4e9e68dd0 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -114,7 +114,6 @@
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index 5527659aaa..3aeac68121 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -114,7 +114,6 @@
   <flag name='machine.pseries.cap-htm'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index e8e6ab7e9d..c1e72e3d9e 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -110,7 +110,6 @@
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index d08eadc5b4..bebdf2ea75 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -147,7 +147,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index a971ccf740..46d6932662 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -42,7 +42,6 @@
   <flag name='memory-backend-file.discard-data'/>
   <flag name='screendump_device'/>
   <flag name='egl-headless'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 8a33f277ab..3ac32468f5 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -146,7 +146,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 83d814613d..0c20e6c535 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -113,7 +113,6 @@
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index fd07ed826e..c5ddbb1d09 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -112,7 +112,6 @@
   <flag name='machine.pseries.cap-htm'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 7c3adbe8b1..98b02aa2da 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -108,7 +108,6 @@
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index edadf9ff2c..5244458ebf 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -77,7 +77,6 @@
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 838add4a26..0824e37c24 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -146,7 +146,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index f59c32fe9d..2e0bb0a374 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -114,7 +114,6 @@
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index e39ec10987..1a17bb6dfd 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -77,7 +77,6 @@
   <flag name='vhost-vsock'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='vfio-ap'/>
   <flag name='zpci'/>
   <flag name='memory-backend-memfd'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 89f397c458..75eda4d489 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -146,7 +146,6 @@
   <flag name='sev-guest'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index f372d93e28..4943e0dc94 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -144,7 +144,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 9e847c3dcd..eb5ba3786e 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -121,7 +121,6 @@
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index da23234b5b..82c38be8a6 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -111,7 +111,6 @@
   <flag name='machine.pseries.cap-hpt-max-page-size'/>
   <flag name='machine.pseries.cap-htm'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 1e88f23deb..58224325e5 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -144,7 +144,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index 92b996df23..7848f4aca4 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -121,7 +121,6 @@
   <flag name='tpm-emulator'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 24dae3160c..c6c946f758 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -118,7 +118,6 @@
   <flag name='machine.pseries.cap-htm'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 2cf01d010e..0af79c8ea6 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -144,7 +144,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index c6089f29a0..558507c573 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -144,7 +144,6 @@
   <flag name='mch.extended-tseg-mbytes'/>
   <flag name='egl-headless'/>
   <flag name='vfio-pci.display'/>
-  <flag name='blockdev'/>
   <flag name='memory-backend-memfd'/>
   <flag name='memory-backend-memfd.hugetlb'/>
   <flag name='iothread.poll-max-ns'/>
diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c
index 5edcf3d989..adea5ff81b 100644
--- a/tests/qemuhotplugtest.c
+++ b/tests/qemuhotplugtest.c
@@ -73,7 +73,6 @@ qemuHotplugCreateObjects(virDomainXMLOption *xmlopt,

     virQEMUCapsInitQMPBasicArch(priv->qemuCaps);

-    virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_VIRTIO_SCSI);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_DEVICE_USB_STORAGE);
     virQEMUCapsSet(priv->qemuCaps, QEMU_CAPS_CCW);
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index c34cb878de..6dabbaf36a 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -856,9 +856,6 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
     if (!(info->args.fakeCaps = virQEMUCapsNew()))
         abort();

-    /* until removal of the flags is completed we force them also in tests */
-    virQEMUCapsSet(info->args.fakeCaps, QEMU_CAPS_BLOCKDEV);
-
     info->conf = conf;
     info->args.newargs = true;

-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:57 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:57 +0200
Subject: [PATCH 79/80] qemu: Assume and retire QEMU_CAPS_BLOCKDEV_BACKUP
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <6b0069f1b29f0a4a7c0fe1583eef33ff27846b74.1658843187.git.pkrempa@redhat.com>

The blockdev-backup QMP command was introduced in qemu-2.3.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_backup.c                            | 6 ------
 src/qemu/qemu_capabilities.c                      | 6 ++----
 src/qemu/qemu_capabilities.h                      | 2 +-
 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 -
 tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml   | 1 -
 tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml  | 1 -
 tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml  | 1 -
 29 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 60cb79d70d..1012e3aee7 100644
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -802,12 +802,6 @@ qemuBackupBegin(virDomainObj *vm,
         goto endjob;
     }

-    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_BACKUP)) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("backup is not supported with this QEMU"));
-        goto endjob;
-    }
-
     if (virDomainBackupAlignDisks(def, vm->def, suffix) < 0)
         goto endjob;

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 1caae40d0f..9ab57dd9f3 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -621,7 +621,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
               /* 395 */
               "vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */
               "audiodev", /* X_QEMU_CAPS_AUDIODEV */
-              "blockdev-backup", /* QEMU_CAPS_BLOCKDEV_BACKUP */
+              "blockdev-backup", /* X_QEMU_CAPS_BLOCKDEV_BACKUP */
               "object.qapified", /* QEMU_CAPS_OBJECT_JSON */
               "rotation-rate", /* QEMU_CAPS_ROTATION_RATE */

@@ -1586,7 +1586,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
     { "blockdev-add/arg-type/+file/aio/^io_uring", QEMU_CAPS_AIO_IO_URING },
     { "blockdev-add/arg-type/+rbd/encrypt", QEMU_CAPS_RBD_ENCRYPTION },
     { "blockdev-add/arg-type/+nbd/tls-hostname", QEMU_CAPS_BLOCKDEV_NBD_TLS_HOSTNAME },
-    { "blockdev-backup", QEMU_CAPS_BLOCKDEV_BACKUP },
     { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
     { "chardev-add/arg-type/backend/+socket/data/reconnect", QEMU_CAPS_CHARDEV_RECONNECT },
     { "chardev-add/arg-type/backend/+file/data/logfile", QEMU_CAPS_CHARDEV_LOGFILE },
@@ -5241,8 +5240,7 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
 void
 virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
 {
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_BACKUP) &&
-        virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) &&
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV_REOPEN) &&
         virQEMUCapsGet(qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BLOCK_BITMAP_MAPPING))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_INCREMENTAL_BACKUP);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 097ecdca32..78147ee75f 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -600,7 +600,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     /* 395 */
     QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */
     X_QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */
-    QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */
+    X_QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */
     QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */
     QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index ed59536bd7..874bedda58 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -139,7 +139,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 8adc5e8335..9382b8b3a0 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -140,7 +140,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 41abf5474a..14de631620 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -104,7 +104,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 6af25c80f7..9f8458d4c7 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -182,7 +182,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 77983f4d19..7b7be178c3 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -149,7 +149,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index e0d01288e6..ef689b8305 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -155,7 +155,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index 9fc0898622..619683da4c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -141,7 +141,6 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index c893649c9a..b140bd1451 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -189,7 +189,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index 9d7effca30..542512c9f6 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -63,7 +63,6 @@
   <flag name='netdev.vhost-vdpa'/>
   <flag name='ncr53c90'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index c965dff81c..107e818891 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -191,7 +191,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index a9d87bc33d..97fe865d21 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -153,7 +153,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index ca8d47a534..1eefcc0e75 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -157,7 +157,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 6df5dd097c..1a4ba9ac0e 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -143,7 +143,6 @@
   <flag name='am53c974'/>
   <flag name='vhost-user-blk'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index d03456bc07..f39f5219e1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -111,7 +111,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 59f68dfb3a..26478e90d3 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -192,7 +192,6 @@
   <flag name='vhost-user-blk'/>
   <flag name='cpu-max'/>
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
-  <flag name='blockdev-backup'/>
   <flag name='rotation-rate'/>
   <flag name='input-linux'/>
   <flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 045303ae71..e0e8fef913 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -156,7 +156,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index cdabb03f8e..6461ba4597 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -113,7 +113,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index d8ea781430..e5f4ae82c6 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -195,7 +195,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index 00cd48bdb1..801ba01432 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -195,7 +195,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index b16318bb16..f2096794c6 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -165,7 +165,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 31791cf643..7b25d3a408 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -158,7 +158,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 63011661ae..bfd73616bd 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -195,7 +195,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index ba401e00b2..7c9c905677 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -166,7 +166,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index b0cb53021d..1dd714f9b1 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -169,7 +169,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index f451bc9892..befe5e423f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -195,7 +195,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 31cca6f052..fd014a567c 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -195,7 +195,6 @@
   <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
   <flag name='migration-param.block-bitmap-mapping'/>
   <flag name='vnc-power-control'/>
-  <flag name='blockdev-backup'/>
   <flag name='object.qapified'/>
   <flag name='rotation-rate'/>
   <flag name='compat-deprecated'/>
-- 
2.36.1


From pkrempa at redhat.com  Tue Jul 26 14:37:58 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Tue, 26 Jul 2022 16:37:58 +0200
Subject: [PATCH 80/80] qemuDomainDetermineDiskChain: Remove 'report_broken'
 argument
In-Reply-To: <cover.1658843187.git.pkrempa@redhat.com>
References: <cover.1658843187.git.pkrempa@redhat.com>
Message-ID: <e1a8fa5094fb0654bbaa46bfaa4853bd2c99c6a3.1658843187.git.pkrempa@redhat.com>

All callers pass 'true'.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_domain.c  | 36 +++++++++++++++---------------------
 src/qemu/qemu_domain.h  |  3 +--
 src/qemu/qemu_driver.c  |  2 +-
 src/qemu/qemu_hotplug.c |  4 ++--
 src/qemu/qemu_process.c |  2 +-
 5 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index d372381c74..e227a8b7d4 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7617,19 +7617,16 @@ qemuDomainPrepareStorageSourceConfig(virStorageSource *src,
  * @vm: domain object
  * @disk: disk definition
  * @disksrc: source to determine the chain for, may be NULL
- * @report_broken: report broken chain verbosely
  *
  * Prepares and initializes the backing chain of disk @disk. In cases where
  * a new source is to be associated with @disk the @disksrc parameter can be
- * used to override the source. If @report_broken is true missing images
- * in the backing chain are reported.
+ * used to override the source.
  */
 int
 qemuDomainDetermineDiskChain(virQEMUDriver *driver,
                              virDomainObj *vm,
                              virDomainDiskDef *disk,
-                             virStorageSource *disksrc,
-                             bool report_broken)
+                             virStorageSource *disksrc)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
     virStorageSource *src; /* iterator for the backing chain declared in XML */
@@ -7651,8 +7648,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
         disksrc->format < VIR_STORAGE_FILE_BACKING) {

         if (!virFileExists(disksrc->path)) {
-            if (report_broken)
-                virStorageSourceReportBrokenChain(errno, disksrc, disksrc);
+            virStorageSourceReportBrokenChain(errno, disksrc, disksrc);

             return -1;
         }
@@ -7675,24 +7671,22 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
     src = disksrc;
     /* skip to the end of the chain if there is any */
     while (virStorageSourceHasBacking(src)) {
-        if (report_broken) {
-            int rv = virStorageSourceSupportsAccess(src);
+        int rv = virStorageSourceSupportsAccess(src);

-            if (rv < 0)
-                return -1;
-
-            if (rv > 0) {
-                if (qemuDomainStorageFileInit(driver, vm, src, disksrc) < 0)
-                    return -1;
+        if (rv < 0)
+            return -1;

-                if (virStorageSourceAccess(src, F_OK) < 0) {
-                    virStorageSourceReportBrokenChain(errno, src, disksrc);
-                    virStorageSourceDeinit(src);
-                    return -1;
-                }
+        if (rv > 0) {
+            if (qemuDomainStorageFileInit(driver, vm, src, disksrc) < 0)
+                return -1;

+            if (virStorageSourceAccess(src, F_OK) < 0) {
+                virStorageSourceReportBrokenChain(errno, src, disksrc);
                 virStorageSourceDeinit(src);
+                return -1;
             }
+
+            virStorageSourceDeinit(src);
         }
         src = src->backingStore;
     }
@@ -7710,7 +7704,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,

     if (virStorageSourceGetMetadata(src, uid, gid,
                                     QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH,
-                                    report_broken) < 0)
+                                    true) < 0)
         return -1;

     for (n = src->backingStore; virStorageSourceIsBacking(n); n = n->backingStore) {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index abf245ec2a..dcae0f9601 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -710,8 +710,7 @@ int qemuDomainStorageSourceValidateDepth(virStorageSource *src,
 int qemuDomainDetermineDiskChain(virQEMUDriver *driver,
                                  virDomainObj *vm,
                                  virDomainDiskDef *disk,
-                                 virStorageSource *disksrc,
-                                 bool report_broken);
+                                 virStorageSource *disksrc);

 bool qemuDomainDiskChangeSupported(virDomainDiskDef *disk,
                                    virDomainDiskDef *orig_disk);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 8c7cb64f98..49f694e0a7 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15141,7 +15141,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
     if (mirror_reuse &&
         mirror->format >= VIR_STORAGE_FILE_BACKING &&
         mirror->backingStore == NULL &&
-        qemuDomainDetermineDiskChain(driver, vm, disk, mirror, true) < 0)
+        qemuDomainDetermineDiskChain(driver, vm, disk, mirror) < 0)
         goto endjob;

     if (qemuDomainStorageSourceChainAccessAllow(driver, vm, mirror) < 0)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index afc9d299f5..72e5b106e9 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -576,7 +576,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver,
     if (virDomainDiskTranslateSourcePool(disk) < 0)
         goto cleanup;

-    if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0)
+    if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
         goto cleanup;

     if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
@@ -910,7 +910,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
     if (virDomainDiskTranslateSourcePool(disk) < 0)
         goto cleanup;

-    if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0)
+    if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
         goto cleanup;

     for (i = 0; i < vm->def->ndisks; i++) {
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index f15222e932..a596ae8dec 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -6796,7 +6796,7 @@ qemuProcessPrepareHostStorage(virQEMUDriver *driver,
         if (qemuDomainDiskIsMissingLocalOptional(disk) && cold_boot)
             VIR_INFO("optional disk '%s' source file is missing, "
                      "skip checking disk chain", disk->dst);
-        else if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) >= 0)
+        else if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) >= 0)
             continue;

         if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= 0)
-- 
2.36.1


From mprivozn at redhat.com  Wed Jul 27 10:34:46 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:46 +0200
Subject: [PATCH v14 00/15] Support query and use SGX
Message-ID: <cover.1658917570.git.mprivozn@redhat.com>

As agreed here, I've taken posted patches, did some changes and fixes
and posted them:

https://listman.redhat.com/archives/libvir-list/2022-July/233164.html

The v13 version can be found here:

https://listman.redhat.com/archives/libvir-list/2022-July/232679.html

diff to v13:
- I've worked my comments in (couple of memleaks, naming issues, ...)
- Fixed problem with CGroups and namespaces
- Fixed a problem with <memoryBacking> <source type='memfd'/>, which
  prevented domain from starting. Simply because wrong memory-backend
  was picked for SGX (-memfd was picked instead of -sgx).
- Some cleanups, formatted before original patches (more tests,
  validation, code separation, ...)

You can find these patches on my gitlab (among with green pipeline):

https://gitlab.com/MichalPrivoznik/libvirt/-/commits/sgx_rework

Haibin Huang (4):
  domain_capabilities: Define SGX capabilities structs
  qemu: Get SGX capabilities form QMP
  Convert QMP capabilities to domain capabilities
  conf: expose SGX feature in domain capabilities

Lin Yang (2):
  conf: Introduce SGX EPC element into device memory xml
  qemu: Add command-line to generate SGX EPC memory backend

Michal Pr?vozn?k (9):
  qemuxml2argvtest: Switch memory-hotplug-dimm-addr to latest caps
  qemuxml2xmltest: Test memory-hotplug-dimm-addr
  conf: Validate virDomainMemoryDef::targetNode
  qemu_command: Separate domain features building into a helper
  qemu_command: Separate domain memory building into a helper
  qemu_cgroup: Don't ignore ENOENT in qemuCgroupAllowDevicesPaths()
  qemu_cgroup: Allow SGX in devices controller
  qemu_namespace: Create SGX related nodes in domain's namespace
  security_dac: Set DAC label on SGX /dev nodes

 docs/formatdomain.rst                         |  25 +-
 docs/formatdomaincaps.rst                     |  40 +++
 src/conf/domain_capabilities.c                |  46 +++
 src/conf/domain_capabilities.h                |  22 ++
 src/conf/domain_conf.c                        |  30 ++
 src/conf/domain_conf.h                        |   1 +
 src/conf/domain_postparse.c                   |   1 +
 src/conf/domain_validate.c                    |  22 ++
 src/conf/schemas/domaincaps.rng               |  40 +++
 src/conf/schemas/domaincommon.rng             |   1 +
 src/libvirt_private.syms                      |   1 +
 src/qemu/qemu_alias.c                         |   6 +-
 src/qemu/qemu_capabilities.c                  | 222 +++++++++++++
 src/qemu/qemu_capabilities.h                  |   6 +
 src/qemu/qemu_cgroup.c                        |  82 ++++-
 src/qemu/qemu_command.c                       | 293 +++++++++++-------
 src/qemu/qemu_domain.c                        |  48 ++-
 src/qemu/qemu_domain.h                        |   2 +
 src/qemu/qemu_domain_address.c                |   6 +
 src/qemu/qemu_driver.c                        |   1 +
 src/qemu/qemu_monitor.c                       |  10 +
 src/qemu/qemu_monitor.h                       |   3 +
 src/qemu/qemu_monitor_json.c                  | 148 ++++++++-
 src/qemu/qemu_monitor_json.h                  |   4 +
 src/qemu/qemu_namespace.c                     |  20 +-
 src/qemu/qemu_process.c                       |   2 +
 src/qemu/qemu_validate.c                      |   8 +
 src/security/security_apparmor.c              |   1 +
 src/security/security_dac.c                   |  44 ++-
 src/security/security_selinux.c               |   2 +
 tests/domaincapsdata/bhyve_basic.x86_64.xml   |   1 +
 tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |   1 +
 tests/domaincapsdata/bhyve_uefi.x86_64.xml    |   1 +
 tests/domaincapsdata/empty.xml                |   1 +
 tests/domaincapsdata/libxl-xenfv.xml          |   1 +
 tests/domaincapsdata/libxl-xenpv.xml          |   1 +
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_4.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |   1 +
 .../qemu_4.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_4.2.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_5.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_5.1.0.sparc.xml     |   1 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |   1 +
 .../qemu_5.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_5.2.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |   1 +
 .../qemu_6.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_6.0.0.s390x.xml     |   1 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |   1 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |   1 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |   1 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |   6 +
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |   6 +
 .../qemu_6.2.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |   6 +
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |  10 +
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |  10 +
 .../qemu_7.0.0-virt.aarch64.xml               |   1 +
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |   1 +
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |   1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |  10 +
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |  10 +
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |  10 +
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |  10 +
 .../caps_6.2.0.x86_64.replies                 |  24 +-
 .../caps_6.2.0.x86_64.xml                     |   7 +
 .../caps_7.0.0.x86_64.replies                 |  34 +-
 .../caps_7.0.0.x86_64.xml                     |  11 +
 .../caps_7.1.0.x86_64.replies                 |  34 +-
 .../caps_7.1.0.x86_64.xml                     |  11 +
 .../aarch64-aavmf-virtio-mmio.args            |   2 +-
 .../aarch64-cpu-passthrough.args              |   2 +-
 ...fault-cpu-kvm-virt-4.2.aarch64-latest.args |   2 +-
 ...fault-cpu-tcg-virt-4.2.aarch64-latest.args |   2 +-
 .../aarch64-features-sve.aarch64-latest.args  |   2 +-
 tests/qemuxml2argvdata/aarch64-gic-host.args  |   2 +-
 .../aarch64-gic-none-tcg.args                 |   2 +-
 tests/qemuxml2argvdata/aarch64-gic-v2.args    |   2 +-
 tests/qemuxml2argvdata/aarch64-gic-v3.args    |   2 +-
 .../qemuxml2argvdata/aarch64-pci-serial.args  |   2 +-
 .../aarch64-tpm.aarch64-latest.args           |   2 +-
 .../aarch64-traditional-pci.args              |   2 +-
 .../aarch64-usb-controller-nec-xhci.args      |   2 +-
 .../aarch64-usb-controller-qemu-xhci.args     |   2 +-
 .../aarch64-video-default.args                |   2 +-
 .../aarch64-video-virtio-gpu-pci.args         |   2 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |   2 +-
 .../aarch64-virt-default-nic.args             |   2 +-
 .../aarch64-virt-graphics.aarch64-latest.args |   2 +-
 .../aarch64-virt-headless.aarch64-latest.args |   2 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |   2 +-
 .../aarch64-virtio-pci-default.args           |   2 +-
 .../aarch64-virtio-pci-manual-addresses.args  |   2 +-
 .../balloon-mmio-deflate.args                 |   2 +-
 .../clock-timer-armvtimer.aarch64-latest.args |   2 +-
 ...ult-video-type-aarch64.aarch64-latest.args |   2 +-
 ...mware-auto-efi-aarch64.aarch64-latest.args |   2 +-
 ...-auto-efi-enrolled-keys.x86_64-latest.args |   2 +-
 ...-auto-efi-loader-secure.x86_64-latest.args |   2 +-
 ...to-efi-no-enrolled-keys.x86_64-latest.args |   2 +-
 ...are-auto-efi-no-secboot.x86_64-latest.args |   2 +-
 ...firmware-auto-efi-nvram.x86_64-latest.args |   2 +-
 ...rmware-auto-efi-secboot.x86_64-latest.args |   2 +-
 ...ware-auto-efi-stateless.x86_64-latest.args |   2 +-
 .../firmware-auto-efi.x86_64-latest.args      |   2 +-
 ...manual-bios-rw-implicit.x86_64-latest.args |   2 +-
 ...firmware-manual-bios-rw.x86_64-latest.args |   2 +-
 .../firmware-manual-efi-acpi-aarch64.args     |   2 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |   2 +-
 ...e-manual-efi-nvram-file.x86_64-latest.args |   2 +-
 ...efi-nvram-network-iscsi.x86_64-latest.args |   2 +-
 ...l-efi-nvram-network-nbd.x86_64-latest.args |   2 +-
 ...nual-efi-nvram-template.x86_64-latest.args |   2 +-
 ...re-manual-efi-stateless.x86_64-latest.args |   2 +-
 .../firmware-manual-noefi-noacpi-aarch64.args |   2 +-
 .../hvf-aarch64-virt-headless.args            |   2 +-
 .../intel-iommu-aw-bits.x86_64-latest.args    |   2 +-
 ...ntel-iommu-caching-mode.x86_64-latest.args |   2 +-
 ...ntel-iommu-device-iotlb.x86_64-latest.args |   2 +-
 .../intel-iommu-eim.x86_64-latest.args        |   2 +-
 .../iommu-smmuv3.aarch64-latest.args          |   2 +-
 .../launch-security-s390-pv.s390x-latest.args |   2 +-
 ...nch-security-sev-direct.x86_64-latest.args |   2 +-
 ...ev-missing-platform-info.x86_64-6.0.0.args |   2 +-
 .../launch-security-sev.x86_64-6.0.0.args     |   2 +-
 .../mach-virt-console-virtio.args             |   2 +-
 .../mach-virt-serial-native.args              |   2 +-
 .../mach-virt-serial-pci.args                 |   2 +-
 .../mach-virt-serial-usb.args                 |   2 +-
 .../machine-aeskeywrap-off-cap.args           |   2 +-
 .../machine-aeskeywrap-off-caps.args          |   2 +-
 .../machine-aeskeywrap-on-cap.args            |   2 +-
 .../machine-aeskeywrap-on-caps.args           |   2 +-
 .../machine-deakeywrap-off-cap.args           |   2 +-
 .../machine-deakeywrap-off-caps.args          |   2 +-
 .../machine-deakeywrap-on-cap.args            |   2 +-
 .../machine-deakeywrap-on-caps.args           |   2 +-
 ...emory-hotplug-dimm-addr.x86_64-latest.args |  42 +++
 .../memory-hotplug-dimm-addr.xml              |   2 +-
 .../memory-hotplug-invalid-targetnode.err     |   1 +
 .../memory-hotplug-invalid-targetnode.xml     |  42 +++
 ...e-expander-bus-aarch64.aarch64-latest.args |   2 +-
 ...eries-cpu-compat-power10.ppc64-latest.args |   2 +-
 ...series-cpu-compat-power9.ppc64-latest.args |   2 +-
 tests/qemuxml2argvdata/pseries-features.args  |   2 +-
 .../sgx-epc-numa.x86_64-latest.args           |  40 +++
 tests/qemuxml2argvdata/sgx-epc-numa.xml       |  64 ++++
 ...mm-addr.args => sgx-epc.x86_64-6.2.0.args} |  29 +-
 tests/qemuxml2argvdata/sgx-epc.xml            |  52 ++++
 .../virtio-iommu-aarch64.aarch64-latest.args  |   2 +-
 tests/qemuxml2argvtest.c                      |   7 +-
 ...memory-hotplug-dimm-addr.x86_64-latest.xml |  63 ++++
 .../sgx-epc-numa.x86_64-latest.xml            |   1 +
 .../sgx-epc.x86_64-6.2.0.xml                  |   1 +
 tests/qemuxml2xmltest.c                       |   4 +
 189 files changed, 1621 insertions(+), 266 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err
 create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml
 rename tests/qemuxml2argvdata/{memory-hotplug-dimm-addr.args => sgx-epc.x86_64-6.2.0.args} (39%)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml

-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:47 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:47 +0200
Subject: [PATCH v14 01/15] qemuxml2argvtest: Switch memory-hotplug-dimm-addr
 to latest caps
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <cd7056acc0af8d2dc9ebd7c54c8b7dc65ce9170b.1658917570.git.mprivozn@redhat.com>

So far, we are testing memory-hotplug-dimm-addr against a set of
explicitly listed capabilities. While this works, lets switch it
to DO_TEST_CAPS_LATEST() so that the latest capabilities are
used. This in turn means, we have to update the <emulator/>
because the latest capabilities don't contain caps for
qemu-system-i386.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 ...mory-hotplug-dimm-addr.x86_64-latest.args} | 30 +++++++++++--------
 .../memory-hotplug-dimm-addr.xml              |  2 +-
 tests/qemuxml2argvtest.c                      |  3 +-
 3 files changed, 19 insertions(+), 16 deletions(-)
 rename tests/qemuxml2argvdata/{memory-hotplug-dimm-addr.args => memory-hotplug-dimm-addr.x86_64-latest.args} (32%)

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
similarity index 32%
rename from tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
rename to tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
index 110b1a32b7..ac24c77a2b 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
@@ -6,17 +6,18 @@ 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 \
+/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 \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
 -machine pc,usb=off,dump-guest-core=off \
 -accel tcg \
+-cpu qemu64 \
 -m size=219136k,slots=16,maxmem=1099511627776k \
 -overcommit mem-lock=off \
--smp 2,sockets=2,cores=1,threads=1 \
--numa node,nodeid=0,cpus=0-1,mem=214 \
+-smp 2,sockets=2,dies=1,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":224395264}' \
+-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -display none \
 -no-user-config \
@@ -27,12 +28,15 @@ QEMU_AUDIO_DRV=none \
 -no-shutdown \
 -no-acpi \
 -boot strict=on \
--usb \
--object memory-backend-file,id=memdimm0,mem-path=/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=536870912,host-nodes=1-3,policy=bind \
--device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
--object memory-backend-ram,id=memdimm2,size=536870912 \
--device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \
--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 \
--device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \
+-object '{"qom-type":"memory-backend-file","id":"memdimm0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","prealloc":true,"size":536870912,"host-nodes":[1,2,3],"policy":"bind"}' \
+-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm0","id":"dimm0","slot":0,"addr":4294967296}' \
+-object '{"qom-type":"memory-backend-ram","id":"memdimm2","size":536870912}' \
+-device '{"driver":"pc-dimm","node":0,"memdev":"memdimm2","id":"dimm2","slot":2}' \
+-blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
+-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-format","id":"ide0-0-0","bootindex":1}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 -msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
index ea4f4fd745..92ea679bbe 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
@@ -20,7 +20,7 @@
   <on_reboot>restart</on_reboot>
   <on_crash>destroy</on_crash>
   <devices>
-    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
     <disk type='block' device='disk'>
       <source dev='/dev/HostVG/QEMUGuest1'/>
       <target dev='hda' bus='ide'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b72d61c3bc..d1a36f653c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3083,8 +3083,7 @@ mymain(void)
     DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA);
     DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
             QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
-    DO_TEST("memory-hotplug-dimm-addr", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
-            QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
+    DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
     DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_OBJECT_MEMORY_RAM, QEMU_CAPS_OBJECT_MEMORY_FILE);
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:48 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:48 +0200
Subject: [PATCH v14 02/15] qemuxml2xmltest: Test memory-hotplug-dimm-addr
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <f5db919c6b5e5655bb2394747ab850a796f81f0d.1658917570.git.mprivozn@redhat.com>

After previous commit, when memory-hotplug-dimm-addr.xml file was
fixed, we can also introduce the test case to qemuxml2xmltest.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 ...memory-hotplug-dimm-addr.x86_64-latest.xml | 63 +++++++++++++++++++
 tests/qemuxml2xmltest.c                       |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml

diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
new file mode 100644
index 0000000000..ef671fcfa3
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
@@ -0,0 +1,63 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory>
+  <memory unit='KiB'>7434230</memory>
+  <currentMemory unit='KiB'>7434230</currentMemory>
+  <vcpu placement='static' cpuset='0-1'>2</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
+    <numa>
+      <cell id='0' cpus='0-1' memory='219136' 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>
+    <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='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <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'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </memballoon>
+    <memory model='dimm'>
+      <source>
+        <nodemask>1-3</nodemask>
+        <pagesize unit='KiB'>2048</pagesize>
+      </source>
+      <target>
+        <size unit='KiB'>524287</size>
+        <node>0</node>
+      </target>
+      <address type='dimm' slot='0' base='0x100000000'/>
+    </memory>
+    <memory model='dimm'>
+      <target>
+        <size unit='KiB'>524287</size>
+        <node>0</node>
+      </target>
+      <address type='dimm' slot='2'/>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 8cac50c767..4cbf380e44 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1175,6 +1175,7 @@ mymain(void)
                  QEMU_CAPS_OBJECT_MEMORY_FILE, QEMU_CAPS_LAST, ARG_END);
     DO_TEST_NOCAPS("memory-hotplug");
     DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM);
+    DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr");
     DO_TEST("memory-hotplug-nvdimm", QEMU_CAPS_DEVICE_NVDIMM);
     DO_TEST("memory-hotplug-nvdimm-access", QEMU_CAPS_DEVICE_NVDIMM);
     DO_TEST("memory-hotplug-nvdimm-label", QEMU_CAPS_DEVICE_NVDIMM);
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:49 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:49 +0200
Subject: [PATCH v14 03/15] conf: Validate virDomainMemoryDef::targetNode
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <ee85278de9c0e6545271374c3ff472f0b53283bd.1658917570.git.mprivozn@redhat.com>

Almost all of memory models we currently support allow setting
virDomainMemoryDef::targetNode so that the memory module is
associated with given guest NUMA node. And we do have a check
whether the requested node is within bounds, but it's executed
only when building QEMU's cmd line. Move it into validation
phase.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_validate.c                    | 13 ++++++
 src/qemu/qemu_command.c                       |  9 ----
 .../memory-hotplug-invalid-targetnode.err     |  1 +
 .../memory-hotplug-invalid-targetnode.xml     | 42 +++++++++++++++++++
 tests/qemuxml2argvtest.c                      |  1 +
 5 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err
 create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml

diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index cfd868fafa..e673e4b81a 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2227,6 +2227,19 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
 {
     unsigned long long thpSize;
 
+    /* Guest NUMA nodes are continuous and indexed from zero. */
+    if (mem->targetNode != -1) {
+        const size_t nodeCount = virDomainNumaGetNodeCount(def->numa);
+
+        if (mem->targetNode >= nodeCount) {
+            virReportError(VIR_ERR_XML_DETAIL,
+                           _("can't add memory backend for guest node '%d' as the guest has only '%zu' NUMA nodes configured"),
+                           mem->targetNode, nodeCount);
+            return -1;
+        }
+    }
+
+
     switch (mem->model) {
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
         if (!mem->nvdimmPath) {
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 30c9bbbf2e..77f5644b1c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3695,15 +3695,6 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps,
     *backendProps = NULL;
 
     if (mem->targetNode >= 0) {
-        /* memory devices could provide a invalid guest node */
-        if (mem->targetNode >= virDomainNumaGetNodeCount(def->numa)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("can't add memory backend for guest node '%d' as "
-                             "the guest has only '%zu' NUMA nodes configured"),
-                           mem->targetNode, virDomainNumaGetNodeCount(def->numa));
-            return -1;
-        }
-
         if (memAccess == VIR_DOMAIN_MEMORY_ACCESS_DEFAULT)
             memAccess = virDomainNumaGetNodeMemoryAccessMode(def->numa, mem->targetNode);
 
diff --git a/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err b/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err
new file mode 100644
index 0000000000..a72e38bfaf
--- /dev/null
+++ b/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err
@@ -0,0 +1 @@
+can't add memory backend for guest node '1' as the guest has only '1' NUMA nodes configured
diff --git a/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml b/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml
new file mode 100644
index 0000000000..feb11368a8
--- /dev/null
+++ b/tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml
@@ -0,0 +1,42 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <maxMemory slots='16' unit='KiB'>1099511627776</maxMemory>
+  <memory unit='KiB'>1267710</memory>
+  <currentMemory unit='KiB'>1267710</currentMemory>
+  <vcpu placement='static' cpuset='0-1'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
+    <numa>
+      <cell id='0' cpus='0-1' memory='219136' 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>
+    <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='ide' index='0'/>
+    <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='virtio'/>
+    <memory model='dimm'>
+      <target>
+        <size unit='KiB'>523264</size>
+        <node>1</node>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d1a36f653c..05537d9e96 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3079,6 +3079,7 @@ mymain(void)
 
     DO_TEST_FAILURE_NOCAPS("memory-align-fail");
     DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM);
+    DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode");
     DO_TEST_NOCAPS("memory-hotplug");
     DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA);
     DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA,
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:50 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:50 +0200
Subject: [PATCH v14 04/15] qemu_command: Separate domain features building
 into a helper
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <7ef596aa6e1ee187eb7a2113557d3e2fb3eb53ef.1658917570.git.mprivozn@redhat.com>

The qemuBuildMachineCommandLine() function is needlessly long.
Separate out parts that generate arguments based on
domainDef->features[] into
qemuAppendDomainFeaturesMachineParam(). Unfortunately, expected
outputs for some qemuxml2argvdata cases needed to be updated
because the order in which features are generated is changed. But
there's no functional change.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_command.c                       | 154 ++++++++++--------
 ...-auto-efi-enrolled-keys.x86_64-latest.args |   2 +-
 ...-auto-efi-loader-secure.x86_64-latest.args |   2 +-
 ...firmware-auto-efi-nvram.x86_64-latest.args |   2 +-
 ...rmware-auto-efi-secboot.x86_64-latest.args |   2 +-
 .../firmware-auto-efi.x86_64-latest.args      |   2 +-
 .../firmware-manual-efi-secure.args           |   2 +-
 .../machine-smm-off.x86_64-latest.args        |   2 +-
 .../machine-smm-on.x86_64-latest.args         |   2 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |   2 +-
 .../q35-virt-manager-basic.args               |   2 +-
 .../tseg-explicit-size.x86_64-latest.args     |   2 +-
 12 files changed, 95 insertions(+), 81 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 77f5644b1c..b5f1d7de0a 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6956,48 +6956,21 @@ qemuBuildNameCommandLine(virCommand *cmd,
     return 0;
 }
 
+
 static int
-qemuBuildMachineCommandLine(virCommand *cmd,
-                            virQEMUDriverConfig *cfg,
-                            const virDomainDef *def,
-                            virQEMUCaps *qemuCaps,
-                            qemuDomainObjPrivate *priv)
+qemuAppendDomainFeaturesMachineParam(virBuffer *buf,
+                                     const virDomainDef *def,
+                                     virQEMUCaps *qemuCaps)
 {
     virTristateSwitch vmport = def->features[VIR_DOMAIN_FEATURE_VMPORT];
     virTristateSwitch smm = def->features[VIR_DOMAIN_FEATURE_SMM];
-    virCPUDef *cpu = def->cpu;
-    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    size_t i;
-
-    virCommandAddArg(cmd, "-machine");
-    virBufferAdd(&buf, def->os.machine, -1);
-
-    /* To avoid the collision of creating USB controllers when calling
-     * machine->init in QEMU, it needs to set usb=off
-     */
-    virBufferAddLit(&buf, ",usb=off");
 
     if (vmport != VIR_TRISTATE_SWITCH_ABSENT)
-        virBufferAsprintf(&buf, ",vmport=%s",
+        virBufferAsprintf(buf, ",vmport=%s",
                           virTristateSwitchTypeToString(vmport));
 
-    if (smm)
-        virBufferAsprintf(&buf, ",smm=%s", virTristateSwitchTypeToString(smm));
-
-    if (def->mem.dump_core) {
-        virBufferAsprintf(&buf, ",dump-guest-core=%s",
-                          virTristateSwitchTypeToString(def->mem.dump_core));
-    } else {
-        virBufferAsprintf(&buf, ",dump-guest-core=%s",
-                          cfg->dumpGuestCore ? "on" : "off");
-    }
-
-    if (def->mem.nosharepages)
-        virBufferAddLit(&buf, ",mem-merge=off");
-
-    if (def->keywrap &&
-        !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap))
-        return -1;
+    if (smm != VIR_TRISTATE_SWITCH_ABSENT)
+        virBufferAsprintf(buf, ",smm=%s", virTristateSwitchTypeToString(smm));
 
     if (def->features[VIR_DOMAIN_FEATURE_GIC] == VIR_TRISTATE_SWITCH_ON) {
         bool hasGICVersionOption = virQEMUCapsGet(qemuCaps,
@@ -7025,7 +6998,7 @@ qemuBuildMachineCommandLine(virCommand *cmd,
                 return -1;
             }
 
-            virBufferAsprintf(&buf, ",gic-version=%s",
+            virBufferAsprintf(buf, ",gic-version=%s",
                               virGICVersionTypeToString(def->gic_version));
             break;
 
@@ -7036,38 +7009,13 @@ qemuBuildMachineCommandLine(virCommand *cmd,
         }
     }
 
-    if (def->iommu) {
-        switch (def->iommu->model) {
-        case VIR_DOMAIN_IOMMU_MODEL_SMMUV3:
-            virBufferAddLit(&buf, ",iommu=smmuv3");
-            break;
-
-        case VIR_DOMAIN_IOMMU_MODEL_INTEL:
-        case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
-            /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */
-            break;
-
-        case VIR_DOMAIN_IOMMU_MODEL_LAST:
-        default:
-            virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model);
-            return -1;
-        }
-    }
-
-    for (i = 0; i < def->nmems; i++) {
-        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
-            virBufferAddLit(&buf, ",nvdimm=on");
-            break;
-        }
-    }
-
     if (def->features[VIR_DOMAIN_FEATURE_IOAPIC] != VIR_DOMAIN_IOAPIC_NONE) {
         switch ((virDomainIOAPIC) def->features[VIR_DOMAIN_FEATURE_IOAPIC]) {
         case VIR_DOMAIN_IOAPIC_QEMU:
-            virBufferAddLit(&buf, ",kernel_irqchip=split");
+            virBufferAddLit(buf, ",kernel_irqchip=split");
             break;
         case VIR_DOMAIN_IOAPIC_KVM:
-            virBufferAddLit(&buf, ",kernel_irqchip=on");
+            virBufferAddLit(buf, ",kernel_irqchip=on");
             break;
         case VIR_DOMAIN_IOAPIC_NONE:
         case VIR_DOMAIN_IOAPIC_LAST:
@@ -7078,12 +7026,12 @@ qemuBuildMachineCommandLine(virCommand *cmd,
     if (def->features[VIR_DOMAIN_FEATURE_HPT] == VIR_TRISTATE_SWITCH_ON) {
 
         if (def->hpt_resizing != VIR_DOMAIN_HPT_RESIZING_NONE) {
-            virBufferAsprintf(&buf, ",resize-hpt=%s",
+            virBufferAsprintf(buf, ",resize-hpt=%s",
                               virDomainHPTResizingTypeToString(def->hpt_resizing));
         }
 
         if (def->hpt_maxpagesize > 0) {
-            virBufferAsprintf(&buf, ",cap-hpt-max-page-size=%lluk",
+            virBufferAsprintf(buf, ",cap-hpt-max-page-size=%lluk",
                               def->hpt_maxpagesize);
         }
     }
@@ -7091,34 +7039,100 @@ qemuBuildMachineCommandLine(virCommand *cmd,
     if (def->features[VIR_DOMAIN_FEATURE_HTM] != VIR_TRISTATE_SWITCH_ABSENT) {
         const char *str;
         str = virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEATURE_HTM]);
-        virBufferAsprintf(&buf, ",cap-htm=%s", str);
+        virBufferAsprintf(buf, ",cap-htm=%s", str);
     }
 
     if (def->features[VIR_DOMAIN_FEATURE_NESTED_HV] != VIR_TRISTATE_SWITCH_ABSENT) {
         const char *str;
         str = virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEATURE_NESTED_HV]);
-        virBufferAsprintf(&buf, ",cap-nested-hv=%s", str);
+        virBufferAsprintf(buf, ",cap-nested-hv=%s", str);
     }
 
     if (def->features[VIR_DOMAIN_FEATURE_CCF_ASSIST] != VIR_TRISTATE_SWITCH_ABSENT) {
         const char *str;
         str = virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEATURE_CCF_ASSIST]);
-        virBufferAsprintf(&buf, ",cap-ccf-assist=%s", str);
+        virBufferAsprintf(buf, ",cap-ccf-assist=%s", str);
     }
 
     if (def->features[VIR_DOMAIN_FEATURE_CFPC] != VIR_DOMAIN_CFPC_NONE) {
         const char *str = virDomainCFPCTypeToString(def->features[VIR_DOMAIN_FEATURE_CFPC]);
-        virBufferAsprintf(&buf, ",cap-cfpc=%s", str);
+        virBufferAsprintf(buf, ",cap-cfpc=%s", str);
     }
 
     if (def->features[VIR_DOMAIN_FEATURE_SBBC] != VIR_DOMAIN_SBBC_NONE) {
         const char *str = virDomainSBBCTypeToString(def->features[VIR_DOMAIN_FEATURE_SBBC]);
-        virBufferAsprintf(&buf, ",cap-sbbc=%s", str);
+        virBufferAsprintf(buf, ",cap-sbbc=%s", str);
     }
 
     if (def->features[VIR_DOMAIN_FEATURE_IBS] != VIR_DOMAIN_IBS_NONE) {
         const char *str = virDomainIBSTypeToString(def->features[VIR_DOMAIN_FEATURE_IBS]);
-        virBufferAsprintf(&buf, ",cap-ibs=%s", str);
+        virBufferAsprintf(buf, ",cap-ibs=%s", str);
+    }
+
+    return 0;
+}
+
+
+static int
+qemuBuildMachineCommandLine(virCommand *cmd,
+                            virQEMUDriverConfig *cfg,
+                            const virDomainDef *def,
+                            virQEMUCaps *qemuCaps,
+                            qemuDomainObjPrivate *priv)
+{
+    virCPUDef *cpu = def->cpu;
+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
+    size_t i;
+
+    virCommandAddArg(cmd, "-machine");
+    virBufferAdd(&buf, def->os.machine, -1);
+
+    /* To avoid the collision of creating USB controllers when calling
+     * machine->init in QEMU, it needs to set usb=off
+     */
+    virBufferAddLit(&buf, ",usb=off");
+
+    if (def->mem.dump_core) {
+        virBufferAsprintf(&buf, ",dump-guest-core=%s",
+                          virTristateSwitchTypeToString(def->mem.dump_core));
+    } else {
+        virBufferAsprintf(&buf, ",dump-guest-core=%s",
+                          cfg->dumpGuestCore ? "on" : "off");
+    }
+
+    if (def->mem.nosharepages)
+        virBufferAddLit(&buf, ",mem-merge=off");
+
+    if (def->keywrap &&
+        !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap))
+        return -1;
+
+    if (qemuAppendDomainFeaturesMachineParam(&buf, def, qemuCaps) < 0)
+        return -1;
+
+    if (def->iommu) {
+        switch (def->iommu->model) {
+        case VIR_DOMAIN_IOMMU_MODEL_SMMUV3:
+            virBufferAddLit(&buf, ",iommu=smmuv3");
+            break;
+
+        case VIR_DOMAIN_IOMMU_MODEL_INTEL:
+        case VIR_DOMAIN_IOMMU_MODEL_VIRTIO:
+            /* These IOMMUs are formatted in qemuBuildIOMMUCommandLine */
+            break;
+
+        case VIR_DOMAIN_IOMMU_MODEL_LAST:
+        default:
+            virReportEnumRangeError(virDomainIOMMUModel, def->iommu->model);
+            return -1;
+        }
+    }
+
+    for (i = 0; i < def->nmems; i++) {
+        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
+            virBufferAddLit(&buf, ",nvdimm=on");
+            break;
+        }
     }
 
     if (cpu && cpu->model &&
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
index 7479b05af4..a9391d7921 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
index 7479b05af4..a9391d7921 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
index 1061e93554..9795dedc7c 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/path/to/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
index 7479b05af4..a9391d7921 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
index 7479b05af4..a9391d7921 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
index fe0f78599b..1a5f83e489 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=test-bios,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
--machine q35,usb=off,smm=on,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off,smm=on \
 -accel tcg \
 -global driver=cfi.pflash01,property=secure,value=on \
 -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \
diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
index 46f6a4a70c..83462bec68 100644
--- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,smm=off,dump-guest-core=off,memory-backend=pc.ram \
+-machine q35,usb=off,dump-guest-core=off,smm=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
index 6fde375523..53a03124b4 100644
--- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \
+-machine q35,usb=off,dump-guest-core=off,smm=on,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index c95c972803..769f3d67e5 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,vmport=off,dump-guest-core=off \
+-machine pc,usb=off,dump-guest-core=off,vmport=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 32875f291c..b4c9715717 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
 -name guest=virt-manager-basic,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \
--machine q35,usb=off,vmport=off,dump-guest-core=off \
+-machine q35,usb=off,dump-guest-core=off,vmport=off \
 -accel kvm \
 -m 4096 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
index 3371199be5..e05f295c4f 100644
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \
+-machine pc-q35-2.10,usb=off,dump-guest-core=off,smm=on,memory-backend=pc.ram \
 -accel tcg \
 -global mch.extended-tseg-mbytes=48 \
 -cpu qemu64 \
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:51 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:51 +0200
Subject: [PATCH v14 05/15] qemu_command: Separate domain memory building into
 a helper
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <5f5c15c2aa094b1e15384d286b690cf0e264523b.1658917570.git.mprivozn@redhat.com>

The qemuBuildMachineCommandLine() function is needlessly long.
Separate out parts that generate memory related arguments into
qemuAppendDomainMemoryMachineParams(). Unfortunately, expected
outputs for some qemuxml2argvdata cases needed to be updated
because the order in which arguments are generated is changed.
But there's no functional change.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_command.c                       | 87 +++++++++++--------
 .../aarch64-aavmf-virtio-mmio.args            |  2 +-
 .../aarch64-cpu-passthrough.args              |  2 +-
 ...fault-cpu-kvm-virt-4.2.aarch64-latest.args |  2 +-
 ...fault-cpu-tcg-virt-4.2.aarch64-latest.args |  2 +-
 .../aarch64-features-sve.aarch64-latest.args  |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-host.args  |  2 +-
 .../aarch64-gic-none-tcg.args                 |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-v2.args    |  2 +-
 tests/qemuxml2argvdata/aarch64-gic-v3.args    |  2 +-
 .../qemuxml2argvdata/aarch64-pci-serial.args  |  2 +-
 .../aarch64-tpm.aarch64-latest.args           |  2 +-
 .../aarch64-traditional-pci.args              |  2 +-
 .../aarch64-usb-controller-nec-xhci.args      |  2 +-
 .../aarch64-usb-controller-qemu-xhci.args     |  2 +-
 .../aarch64-video-default.args                |  2 +-
 .../aarch64-video-virtio-gpu-pci.args         |  2 +-
 .../aarch64-virt-2.6-virtio-pci-default.args  |  2 +-
 .../aarch64-virt-default-nic.args             |  2 +-
 .../aarch64-virt-graphics.aarch64-latest.args |  2 +-
 .../aarch64-virt-headless.aarch64-latest.args |  2 +-
 .../qemuxml2argvdata/aarch64-virt-virtio.args |  2 +-
 .../aarch64-virtio-pci-default.args           |  2 +-
 .../aarch64-virtio-pci-manual-addresses.args  |  2 +-
 .../balloon-mmio-deflate.args                 |  2 +-
 .../clock-timer-armvtimer.aarch64-latest.args |  2 +-
 ...ult-video-type-aarch64.aarch64-latest.args |  2 +-
 ...mware-auto-efi-aarch64.aarch64-latest.args |  2 +-
 ...-auto-efi-enrolled-keys.x86_64-latest.args |  2 +-
 ...-auto-efi-loader-secure.x86_64-latest.args |  2 +-
 ...to-efi-no-enrolled-keys.x86_64-latest.args |  2 +-
 ...are-auto-efi-no-secboot.x86_64-latest.args |  2 +-
 ...firmware-auto-efi-nvram.x86_64-latest.args |  2 +-
 ...rmware-auto-efi-secboot.x86_64-latest.args |  2 +-
 ...ware-auto-efi-stateless.x86_64-latest.args |  2 +-
 .../firmware-auto-efi.x86_64-latest.args      |  2 +-
 ...manual-bios-rw-implicit.x86_64-latest.args |  2 +-
 ...firmware-manual-bios-rw.x86_64-latest.args |  2 +-
 .../firmware-manual-efi-acpi-aarch64.args     |  2 +-
 .../firmware-manual-efi-noacpi-aarch64.args   |  2 +-
 ...e-manual-efi-nvram-file.x86_64-latest.args |  2 +-
 ...efi-nvram-network-iscsi.x86_64-latest.args |  2 +-
 ...l-efi-nvram-network-nbd.x86_64-latest.args |  2 +-
 ...nual-efi-nvram-template.x86_64-latest.args |  2 +-
 .../firmware-manual-efi-secure.args           |  2 +-
 ...re-manual-efi-stateless.x86_64-latest.args |  2 +-
 .../firmware-manual-noefi-noacpi-aarch64.args |  2 +-
 .../hvf-aarch64-virt-headless.args            |  2 +-
 .../intel-iommu-aw-bits.x86_64-latest.args    |  2 +-
 ...ntel-iommu-caching-mode.x86_64-latest.args |  2 +-
 ...ntel-iommu-device-iotlb.x86_64-latest.args |  2 +-
 .../intel-iommu-eim.x86_64-latest.args        |  2 +-
 .../iommu-smmuv3.aarch64-latest.args          |  2 +-
 .../launch-security-s390-pv.s390x-latest.args |  2 +-
 ...nch-security-sev-direct.x86_64-latest.args |  2 +-
 ...ev-missing-platform-info.x86_64-6.0.0.args |  2 +-
 .../launch-security-sev.x86_64-6.0.0.args     |  2 +-
 .../mach-virt-console-virtio.args             |  2 +-
 .../mach-virt-serial-native.args              |  2 +-
 .../mach-virt-serial-pci.args                 |  2 +-
 .../mach-virt-serial-usb.args                 |  2 +-
 .../machine-aeskeywrap-off-cap.args           |  2 +-
 .../machine-aeskeywrap-off-caps.args          |  2 +-
 .../machine-aeskeywrap-on-cap.args            |  2 +-
 .../machine-aeskeywrap-on-caps.args           |  2 +-
 .../machine-deakeywrap-off-cap.args           |  2 +-
 .../machine-deakeywrap-off-caps.args          |  2 +-
 .../machine-deakeywrap-on-cap.args            |  2 +-
 .../machine-deakeywrap-on-caps.args           |  2 +-
 .../machine-smm-off.x86_64-latest.args        |  2 +-
 .../machine-smm-on.x86_64-latest.args         |  2 +-
 .../qemuxml2argvdata/machine-vmport-opt.args  |  2 +-
 ...e-expander-bus-aarch64.aarch64-latest.args |  2 +-
 ...eries-cpu-compat-power10.ppc64-latest.args |  2 +-
 ...series-cpu-compat-power9.ppc64-latest.args |  2 +-
 tests/qemuxml2argvdata/pseries-features.args  |  2 +-
 .../q35-virt-manager-basic.args               |  2 +-
 .../tseg-explicit-size.x86_64-latest.args     |  2 +-
 .../virtio-iommu-aarch64.aarch64-latest.args  |  2 +-
 79 files changed, 128 insertions(+), 115 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b5f1d7de0a..8699b88220 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7073,6 +7073,54 @@ qemuAppendDomainFeaturesMachineParam(virBuffer *buf,
 }
 
 
+static int
+qemuAppendDomainMemoryMachineParams(virBuffer *buf,
+                                    virQEMUDriverConfig *cfg,
+                                    const virDomainDef *def,
+                                    virQEMUCaps *qemuCaps)
+{
+    size_t i;
+
+    if (def->mem.dump_core) {
+        virBufferAsprintf(buf, ",dump-guest-core=%s",
+                          virTristateSwitchTypeToString(def->mem.dump_core));
+    } else {
+        virBufferAsprintf(buf, ",dump-guest-core=%s",
+                          cfg->dumpGuestCore ? "on" : "off");
+    }
+
+    if (def->mem.nosharepages)
+        virBufferAddLit(buf, ",mem-merge=off");
+
+    for (i = 0; i < def->nmems; i++) {
+        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
+            virBufferAddLit(buf, ",nvdimm=on");
+            break;
+        }
+    }
+
+    if (!virDomainNumaGetNodeCount(def->numa)) {
+        const char *defaultRAMid = NULL;
+
+        /* QEMU is obsoleting -mem-path and -mem-prealloc. That means we have
+         * to switch to memory-backend-* even for regular RAM and to keep
+         * domain migratable we have to set the same ID as older QEMUs would.
+         * If domain has no NUMA nodes and QEMU is new enough to expose ID of
+         * the default RAM we want to use it for default RAM (construct
+         * memory-backend-* with corresponding attributes instead of obsolete
+         * -mem-path and -mem-prealloc).
+         * This generates only reference for the memory-backend-* object added
+         * later in qemuBuildMemCommandLine() */
+        defaultRAMid = virQEMUCapsGetMachineDefaultRAMid(qemuCaps,
+                                                         def->virtType,
+                                                         def->os.machine);
+        if (defaultRAMid)
+            virBufferAsprintf(buf, ",memory-backend=%s", defaultRAMid);
+    }
+
+    return 0;
+}
+
 static int
 qemuBuildMachineCommandLine(virCommand *cmd,
                             virQEMUDriverConfig *cfg,
@@ -7082,7 +7130,6 @@ qemuBuildMachineCommandLine(virCommand *cmd,
 {
     virCPUDef *cpu = def->cpu;
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-    size_t i;
 
     virCommandAddArg(cmd, "-machine");
     virBufferAdd(&buf, def->os.machine, -1);
@@ -7092,17 +7139,6 @@ qemuBuildMachineCommandLine(virCommand *cmd,
      */
     virBufferAddLit(&buf, ",usb=off");
 
-    if (def->mem.dump_core) {
-        virBufferAsprintf(&buf, ",dump-guest-core=%s",
-                          virTristateSwitchTypeToString(def->mem.dump_core));
-    } else {
-        virBufferAsprintf(&buf, ",dump-guest-core=%s",
-                          cfg->dumpGuestCore ? "on" : "off");
-    }
-
-    if (def->mem.nosharepages)
-        virBufferAddLit(&buf, ",mem-merge=off");
-
     if (def->keywrap &&
         !qemuAppendKeyWrapMachineParms(&buf, qemuCaps, def->keywrap))
         return -1;
@@ -7128,12 +7164,8 @@ qemuBuildMachineCommandLine(virCommand *cmd,
         }
     }
 
-    for (i = 0; i < def->nmems; i++) {
-        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
-            virBufferAddLit(&buf, ",nvdimm=on");
-            break;
-        }
-    }
+    if (qemuAppendDomainMemoryMachineParams(&buf, cfg, def, qemuCaps) < 0)
+        return -1;
 
     if (cpu && cpu->model &&
         cpu->mode == VIR_CPU_MODE_HOST_MODEL &&
@@ -7174,25 +7206,6 @@ qemuBuildMachineCommandLine(virCommand *cmd,
     if (virDomainNumaHasHMAT(def->numa))
         virBufferAddLit(&buf, ",hmat=on");
 
-    if (!virDomainNumaGetNodeCount(def->numa)) {
-        const char *defaultRAMid = NULL;
-
-        /* QEMU is obsoleting -mem-path and -mem-prealloc. That means we have
-         * to switch to memory-backend-* even for regular RAM and to keep
-         * domain migratable we have to set the same ID as older QEMUs would.
-         * If domain has no NUMA nodes and QEMU is new enough to expose ID of
-         * the default RAM we want to use it for default RAM (construct
-         * memory-backend-* with corresponding attributes instead of obsolete
-         * -mem-path and -mem-prealloc).
-         * This generates only reference for the memory-backend-* object added
-         * later in qemuBuildMemCommandLine() */
-        defaultRAMid = virQEMUCapsGetMachineDefaultRAMid(qemuCaps,
-                                                         def->virtType,
-                                                         def->os.machine);
-        if (defaultRAMid)
-            virBufferAsprintf(&buf, ",memory-backend=%s", defaultRAMid);
-    }
-
     /* On x86 targets, graphics=off activates the serial console
      * output mode in the firmware. On non-x86 targets it has
      * various other undesirable effects that we certainly do
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index f41907ce2b..bce0fb3be2 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index b22f8b1de4..365a9b95bd 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args
index c17bcad5cf..ea798c2511 100644
--- a/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine virt-4.2,usb=off,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt-4.2,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -m 4096 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \
diff --git a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args
index 12d80b1f02..793584c4eb 100644
--- a/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine virt-4.2,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \
+-machine virt-4.2,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 4096 \
diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
index 9b5485c957..7c4e011e57 100644
--- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args
index a064d52b7d..a3afd2393d 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=host \
+-machine virt,usb=off,gic-version=host,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 48c856f517..5925c3768f 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a57 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 43e142372d..76efb79ef1 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index 2cc39ab3b5..14363365cd 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=3 \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off \
 -accel kvm \
 -cpu host \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 89dee4243e..1e25999906 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
index 3125460a95..89ae9bc61c 100644
--- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-aarch64test/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 939e938231..204ecd621e 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index fbb40f8529..6d5308f6c3 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index f7deb39419..8f3d2a3aba 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
index 19050eb340..94d771cfd9 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64-vgpu,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-vgpu/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a57 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index ce9144c820..a376806bc6 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64-vgpu,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-vgpu/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a57 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index ac5cf85c85..228d7aaac3 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt-2.6,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt-2.6,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 229c2fca89..b7c9f566a4 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64-virt-default-nic,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64-virt-default/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
index 4d670b6663..27cd328007 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu cortex-a15 \
 -m 4096 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
index 37e3fdeeeb..5dc81dc18b 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/some/user/nvram/path/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu cortex-a15 \
 -m 4096 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index c20f80928c..7d5e0a7924 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 4c63049723..813a67eb7d 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 4951a60cd0..a9b865e171 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 6837a3e578..ed11e80733 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=aarch64test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-aarch64test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -cpu cortex-a53 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
index 1a5fc89d8a..ce489c3711 100644
--- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -cpu host,kvm-no-adjvtime=on \
 -m 4096 \
diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
index e13a2be3f0..6afb7a8f18 100644
--- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-default-video-type-a/.config \
 -name guest=default-video-type-aarch64-test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-default-video-type-a/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel kvm \
 -m 1024 \
 -object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
index 93f808aba9..b8959f89f4 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-aarch64.aarch64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/aarch64test_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine virt-4.0,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
index a9391d7921..0b02464963 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
index a9391d7921..0b02464963 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
index b2cc6d3ab8..a1ef95ee03 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -m 8 \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
index b2cc6d3ab8..a1ef95ee03 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -m 8 \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
index 9795dedc7c..3659889bf3 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/path/to/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
index a9391d7921..0b02464963 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
index 89f733761e..b79c141b18 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-fedora/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF.sev.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel kvm \
 -cpu qemu64 \
 -m 8 \
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
index a9391d7921..0b02464963 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/fedora_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc-q35-4.0,usb=off,dump-guest-core=off,smm=on,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel kvm \
 -cpu qemu64 \
 -global driver=cfi.pflash01,property=secure,value=on \
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
index 9830078318..7a0d663f81 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-rw-implicit.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
index 9830078318..7a0d663f81 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios-rw.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":false,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
index ef98c940f7..e2f03f697c 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
index f3aa947e52..06da86c827 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
index bede23b678..d3ee7c0fee 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-file.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
index 868a5c6465..07f2180cd8 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-latest.args
@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"libvirt-pflash1-storage-auth-secret0","data":"9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1","keyid":"masterKey0","iv":"AAECAwQFBgcICQoLDA0ODw==","format":"base64"}' \
 -blockdev '{"driver":"iscsi","portal":"example.com:6000","target":"iqn.2013-07.com.example:iscsi-nopool","lun":0,"transport":"tcp","user":"myname","password-secret":"libvirt-pflash1-storage-auth-secret0","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
index 7ea855e02c..f2864f6086 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-nbd.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"nbd","server":{"type":"inet","host":"example.org","port":"6000"},"export":"bar","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
index de7245fed0..1d24a734c6 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-nvram-template.x86_64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/test-bios_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
index 1a5f83e489..fe0f78599b 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=test-bios,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test-bios/master-key.aes \
--machine q35,usb=off,dump-guest-core=off,smm=on \
+-machine q35,usb=off,smm=on,dump-guest-core=off \
 -accel tcg \
 -global driver=cfi.pflash01,property=secure,value=on \
 -drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on \
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
index fa4a677ce9..e87c2d6638 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-stateless.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-test-bios/master-key.aes"}' \
 -blockdev '{"driver":"file","filename":"/usr/share/OVMF/OVMF_CODE.fd","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
--machine pc,usb=off,dump-guest-core=off,pflash0=libvirt-pflash0-format,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,pflash0=libvirt-pflash0-format \
 -accel tcg \
 -cpu qemu64 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
index 293085b105..b175607f1a 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 1024 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
index 3c7747ee51..24de5707db 100644
--- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=test,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-test/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel hvf \
 -drive file=/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
index df11e3ddab..417b5fb9dc 100644
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
index 47976fa6a7..bfcfc35e28 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
index af36c45292..95cd9d26ef 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
index 8e2b54d1f9..12113a2800 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split,memory-backend=pc.ram \
+-machine q35,usb=off,kernel_irqchip=split,dump-guest-core=off,memory-backend=pc.ram \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
index d839dc3758..68aa2f6cf5 100644
--- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -name guest=guest,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-guest/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,iommu=smmuv3,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
diff --git a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args
index 1bb7b3f084..dcf496ccfb 100644
--- a/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args
+++ b/tests/qemuxml2argvdata/launch-security-s390-pv.s390x-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine s390-ccw-virtio,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=s390.ram \
+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu gen15a-base,aen=on,cmmnt=on,vxpdeh=on,aefsi=on,diag318=on,csske=on,mepoch=on,msa9=on,msa8=on,msa7=on,msa6=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,sthyi=on,edat=on,ri=on,deflate=on,edat2=on,etoken=on,vx=on,ipter=on,mepochptff=on,ap=on,vxeh=on,vxpd=on,esop=on,msa9_pckmo=on,vxeh2=on,esort=on,apqi=on,apft=on,els=on,iep=on,apqci=on,cte=on,ais=on,bpb=on,gs=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args
index dac312e301..4f3aefb90e 100644
--- a/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-direct.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pc,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args
index 5dfaf69063..ff46b52403 100644
--- a/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev-missing-platform-info.x86_64-6.0.0.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pc-i440fx-6.0,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \
+-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args
index 5dfaf69063..ff46b52403 100644
--- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args
+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-6.0.0.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pc-i440fx-6.0,usb=off,dump-guest-core=off,confidential-guest-support=lsec0,memory-backend=pc.ram \
+-machine pc-i440fx-6.0,usb=off,dump-guest-core=off,memory-backend=pc.ram,confidential-guest-support=lsec0 \
 -accel kvm \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index ad3ea235ae..eb1ee12a0a 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index a5f60e10b2..e76ff0ee06 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 3f6f66bd0a..f5cbf6bdae 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index 7b65f5bbbc..ef6a042fb0 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine virt,usb=off,dump-guest-core=off,gic-version=2 \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index 276edec05b..a4355ad261 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,aes-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index 276edec05b..a4355ad261 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,aes-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 373deaed52..735135e625 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,aes-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 373deaed52..735135e625 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,aes-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,aes-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 55db1edc3f..03a3f5941e 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,dea-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 55db1edc3f..03a3f5941e 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,dea-key-wrap=off \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index 3617cdccac..62dd284c81 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,dea-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index 3617cdccac..62dd284c81 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -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,usb=off,dump-guest-core=off,dea-key-wrap=on \
+-machine s390-ccw-virtio,usb=off,dea-key-wrap=on,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
index 83462bec68..46f6a4a70c 100644
--- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,smm=off,memory-backend=pc.ram \
+-machine q35,usb=off,smm=off,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
index 53a03124b4..6fde375523 100644
--- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine q35,usb=off,dump-guest-core=off,smm=on,memory-backend=pc.ram \
+-machine q35,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -cpu qemu64 \
 -m 214 \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 769f3d67e5..c95c972803 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
--machine pc,usb=off,dump-guest-core=off,vmport=off \
+-machine pc,usb=off,vmport=off,dump-guest-core=off \
 -accel tcg \
 -m 214 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
index 4f4d5f9a08..b4c331c895 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-aarch64.aarch64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \
 -name guest=pcie-expander-bus-test,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-pcie-expander-bus-te/master-key.aes"}' \
--machine virt,usb=off,dump-guest-core=off,gic-version=2,memory-backend=mach-virt.ram \
+-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram \
 -accel tcg \
 -cpu cortex-a15 \
 -m 2048 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args
index 6986d835eb..01a330f748 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power10.ppc64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power10,memory-backend=ppc_spapr.ram \
+-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram,max-cpu-compat=power10 \
 -accel kvm \
 -cpu host \
 -m 256 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args
index f458999291..b357551120 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.ppc64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power9,memory-backend=ppc_spapr.ram \
+-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram,max-cpu-compat=power9 \
 -accel kvm \
 -cpu host \
 -m 256 \
diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
index 5452a57bb0..d085000dda 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -name guest=guest,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-guest/master-key.aes \
--machine pseries,usb=off,dump-guest-core=off,resize-hpt=required,cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd \
+-machine pseries,usb=off,resize-hpt=required,cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd,dump-guest-core=off \
 -accel tcg \
 -m 512 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index b4c9715717..32875f291c 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
 -name guest=virt-manager-basic,debug-threads=on \
 -S \
 -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-virt-manager-basic/master-key.aes \
--machine q35,usb=off,dump-guest-core=off,vmport=off \
+-machine q35,usb=off,vmport=off,dump-guest-core=off \
 -accel kvm \
 -m 4096 \
 -overcommit mem-lock=off \
diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
index e05f295c4f..3371199be5 100644
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@@ -10,7 +10,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
--machine pc-q35-2.10,usb=off,dump-guest-core=off,smm=on,memory-backend=pc.ram \
+-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off,memory-backend=pc.ram \
 -accel tcg \
 -global mch.extended-tseg-mbytes=48 \
 -cpu qemu64 \
diff --git a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
index 54f069c350..a88078818d 100644
--- a/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-iommu-aarch64.aarch64-latest.args
@@ -14,7 +14,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 -blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \
 -blockdev '{"driver":"file","filename":"/var/lib/libvirt/qemu/nvram/guest_VARS.fd","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \
--machine virt-6.0,usb=off,dump-guest-core=off,gic-version=2,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,memory-backend=mach-virt.ram \
+-machine virt-6.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
 -accel tcg \
 -cpu cortex-a15 \
 -m 1024 \
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:52 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:52 +0200
Subject: [PATCH v14 06/15] qemu_cgroup: Don't ignore ENOENT in
 qemuCgroupAllowDevicesPaths()
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <c55f4578656ec83753f988a82796c7ba64fae239.1658917570.git.mprivozn@redhat.com>

There's no need to skip over ENOENT error in
qemuCgroupAllowDevicesPaths(). The path must exists when
qemuCgroupAllowDevicePath() is called because of virFileExists()
check done right above.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_cgroup.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 51702b52e1..d6f27a5a4d 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -76,16 +76,12 @@ qemuCgroupAllowDevicesPaths(virDomainObj *vm,
     size_t i;
 
     for (i = 0; deviceACL[i] != NULL; i++) {
-        int rv;
-
         if (!virFileExists(deviceACL[i])) {
             VIR_DEBUG("Ignoring non-existent device %s", deviceACL[i]);
             continue;
         }
 
-        rv = qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces);
-        if (rv < 0 &&
-            !virLastErrorIsSystemErrno(ENOENT))
+        if (qemuCgroupAllowDevicePath(vm, deviceACL[i], perms, ignoreEacces) < 0)
             return -1;
     }
 
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:53 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:53 +0200
Subject: [PATCH v14 07/15] domain_capabilities: Define SGX capabilities structs
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <0c3261492013cabeaa6652755c3c00ea05934cc8.1658917570.git.mprivozn@redhat.com>

From: Haibin Huang <haibin.huang at intel.com>

Signed-off-by: Haibin Huang <haibin.huang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/conf/domain_capabilities.c | 11 +++++++++++
 src/conf/domain_capabilities.h | 22 ++++++++++++++++++++++
 src/libvirt_private.syms       |  1 +
 3 files changed, 34 insertions(+)

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 653123f293..1d3bba3019 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -76,6 +76,17 @@ virSEVCapabilitiesFree(virSEVCapability *cap)
 }
 
 
+void
+virSGXCapabilitiesFree(virSGXCapability *cap)
+{
+    if (!cap)
+        return;
+
+    g_free(cap->sections);
+    g_free(cap);
+}
+
+
 static void
 virDomainCapsDispose(void *obj)
 {
diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
index a526969cda..e4654a65cd 100644
--- a/src/conf/domain_capabilities.h
+++ b/src/conf/domain_capabilities.h
@@ -193,6 +193,22 @@ struct _virSEVCapability {
     unsigned int max_es_guests;
 };
 
+typedef struct _virSection virSection;
+struct _virSection {
+    unsigned long long size;
+    int node;
+};
+
+typedef struct _virSGXCapability virSGXCapability;
+struct _virSGXCapability {
+    bool flc;
+    bool sgx1;
+    bool sgx2;
+    unsigned long long section_size;
+    size_t nsections;
+    virSection *sections;
+};
+
 typedef enum {
     VIR_DOMAIN_CAPS_FEATURE_IOTHREADS = 0,
     VIR_DOMAIN_CAPS_FEATURE_VMCOREINFO,
@@ -229,6 +245,7 @@ struct _virDomainCaps {
 
     virDomainCapsFeatureGIC gic;
     virSEVCapability *sev;
+    virSGXCapability *sgx;
     /* add new domain features here */
 
     virTristateBool features[VIR_DOMAIN_CAPS_FEATURE_LAST];
@@ -277,3 +294,8 @@ void
 virSEVCapabilitiesFree(virSEVCapability *capabilities);
 
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSEVCapability, virSEVCapabilitiesFree);
+
+void
+virSGXCapabilitiesFree(virSGXCapability *capabilities);
+
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virSGXCapability, virSGXCapabilitiesFree);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6a5c5600df..08ed484900 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -216,6 +216,7 @@ virDomainCapsEnumSet;
 virDomainCapsFormat;
 virDomainCapsNew;
 virSEVCapabilitiesFree;
+virSGXCapabilitiesFree;
 
 
 # conf/domain_conf.h
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:54 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:54 +0200
Subject: [PATCH v14 08/15] qemu: Get SGX capabilities form QMP
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <42c52bebf36031a405c356167603aa2fa310d2a9.1658917570.git.mprivozn@redhat.com>

From: Haibin Huang <haibin.huang at intel.com>

Generate the QMP command for query-sgx-capabilities and the command
return SGX capabilities from QMP.

{"execute":"query-sgx-capabilities"}

the right reply:
  {"return":
    {
      "sgx": true,
      "section-size": 197132288,
      "flc": true
    }
  }

the error reply:
  {"error":
    {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
  }

Signed-off-by: Haibin Huang <haibin.huang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_monitor.c      |  10 ++++
 src/qemu/qemu_monitor.h      |   3 +
 src/qemu/qemu_monitor_json.c | 107 +++++++++++++++++++++++++++++++++++
 src/qemu/qemu_monitor_json.h |   4 ++
 4 files changed, 124 insertions(+)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 6ebdeb46f3..92fda605d4 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3615,6 +3615,16 @@ qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
 }
 
 
+int
+qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
+                              virSGXCapability **capabilities)
+{
+    QEMU_CHECK_MONITOR(mon);
+
+    return qemuMonitorJSONGetSGXCapabilities(mon, capabilities);
+}
+
+
 int
 qemuMonitorNBDServerStart(qemuMonitor *mon,
                           const virStorageNetHostDef *server,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index b82f198285..98b8df2824 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -853,6 +853,9 @@ int qemuMonitorGetGICCapabilities(qemuMonitor *mon,
 int qemuMonitorGetSEVCapabilities(qemuMonitor *mon,
                                   virSEVCapability **capabilities);
 
+int qemuMonitorGetSGXCapabilities(qemuMonitor *mon,
+                                  virSGXCapability **capabilities);
+
 typedef enum {
   QEMU_MONITOR_MIGRATE_BACKGROUND       = 1 << 0,
   QEMU_MONITOR_MIGRATE_NON_SHARED_DISK  = 1 << 1, /* migration with non-shared storage with full disk copy */
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 941596563a..b045efa203 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6395,6 +6395,113 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
     return 1;
 }
 
+
+/**
+ * qemuMonitorJSONGetSGXCapabilities:
+ * @mon: qemu monitor object
+ * @capabilities: pointer to pointer to a SGX capability structure to be filled
+ *
+ * This function queries and fills in INTEL's SGX platform-specific data.
+ * Note that from QEMU's POV both -object sgx-epc and query-sgx-capabilities
+ * can be present even if SGX is not available, which basically leaves us with
+ * checking for JSON "GenericError" in order to differentiate between compiled-in
+ * support and actual SGX support on the platform.
+ *
+ * Returns: -1 on error,
+ *           0 if SGX is not supported, and
+ *           1 if SGX is supported on the platform.
+ */
+int
+qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
+                                  virSGXCapability **capabilities)
+{
+    g_autoptr(virJSONValue) cmd = NULL;
+    g_autoptr(virJSONValue) reply = NULL;
+    g_autoptr(virSGXCapability) capability = NULL;
+    virJSONValue *sections = NULL;
+    virJSONValue *caps;
+    bool flc = false;
+    bool sgx1 = false;
+    bool sgx2 = false;
+    unsigned long long section_size = 0;
+    unsigned long long size;
+    size_t i;
+
+    *capabilities = NULL;
+    capability = g_new0(virSGXCapability, 1);
+
+    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities", NULL)))
+        return -1;
+
+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
+        return -1;
+
+    /* QEMU has only compiled-in support of SGX */
+    if (qemuMonitorJSONHasError(reply, "GenericError"))
+        return 0;
+
+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
+        return -1;
+
+    caps = virJSONValueObjectGetObject(reply, "return");
+
+    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'flc' field"));
+        return -1;
+    }
+    capability->flc = flc;
+
+    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
+        return -1;
+    }
+    capability->sgx1 = sgx1;
+
+    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
+        return -1;
+    }
+    capability->sgx2 = sgx2;
+
+    if (virJSONValueObjectGetNumberUlong(caps, "section-size", &section_size) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("query-sgx-capabilities reply was missing 'section-size' field"));
+        return -1;
+    }
+    capability->section_size = section_size / 1024;
+
+    if ((sections = virJSONValueObjectGetArray(caps, "sections"))) {
+        /* Got the section, the QEMU version is above 7.0.0 */
+        capability->nsections = virJSONValueArraySize(sections);
+        capability->sections = g_new0(virSection, capability->nsections);
+
+        for (i = 0; i < capability->nsections; i++) {
+            virJSONValue *elem = virJSONValueArrayGet(sections, i);
+
+            if (virJSONValueObjectGetNumberUlong(elem, "size", &size) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("query-sgx-capabilities reply was missing 'size' field"));
+                return -1;
+            }
+            capability->sections[i].size = size / 1024;
+
+            if (virJSONValueObjectGetNumberInt(elem, "node",
+                                               &capability->sections[i].node) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("query-sgx-capabilities reply was missing 'node' field"));
+                return -1;
+            }
+        }
+    }
+
+    *capabilities = g_steal_pointer(&capability);
+    return 1;
+}
+
+
 static virJSONValue *
 qemuMonitorJSONBuildInetSocketAddress(const char *host,
                                       const char *port)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index e4c65e250e..24d2fe90f1 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -175,6 +175,10 @@ int
 qemuMonitorJSONGetGICCapabilities(qemuMonitor *mon,
                                   virGICCapability **capabilities);
 
+int
+qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
+                                  virSGXCapability **capabilities);
+
 int
 qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
                                   virSEVCapability **capabilities);
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:56 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:56 +0200
Subject: [PATCH v14 10/15] conf: expose SGX feature in domain capabilities
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <be853acd968cc63db31582aaf93beb03c7ed9432.1658917570.git.mprivozn@redhat.com>

From: Haibin Huang <haibin.huang at intel.com>

Extend hypervisor capabilities to include sgx feature. When available,
the hypervisor supports launching an VM with SGX on Intel platfrom.
The SGX feature tag privides additional details like section size and
sgx1 or sgx2.

Signed-off-by: Haibin Huang <haibin.huang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomaincaps.rst                     | 40 +++++++++++++++++++
 src/conf/domain_capabilities.c                | 35 ++++++++++++++++
 src/conf/schemas/domaincaps.rng               | 40 +++++++++++++++++++
 src/qemu/qemu_capabilities.c                  | 16 ++++++++
 tests/domaincapsdata/bhyve_basic.x86_64.xml   |  1 +
 tests/domaincapsdata/bhyve_fbuf.x86_64.xml    |  1 +
 tests/domaincapsdata/bhyve_uefi.x86_64.xml    |  1 +
 tests/domaincapsdata/empty.xml                |  1 +
 tests/domaincapsdata/libxl-xenfv.xml          |  1 +
 tests/domaincapsdata/libxl-xenpv.xml          |  1 +
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_3.1.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |  1 +
 .../qemu_4.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_4.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_4.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_4.0.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  1 +
 .../qemu_4.2.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_4.2.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_4.2.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
 .../qemu_5.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_5.1.0.sparc.xml     |  1 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |  1 +
 .../qemu_5.2.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_5.2.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |  1 +
 .../qemu_6.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_6.0.0.s390x.xml     |  1 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  6 +++
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  6 +++
 .../qemu_6.2.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  6 +++
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  | 10 +++++
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  | 10 +++++
 .../qemu_7.0.0-virt.aarch64.xml               |  1 +
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |  1 +
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |  1 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    | 10 +++++
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  | 10 +++++
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  | 10 +++++
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    | 10 +++++
 72 files changed, 268 insertions(+)

diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
index 70f46b972a..bca5389931 100644
--- a/docs/formatdomaincaps.rst
+++ b/docs/formatdomaincaps.rst
@@ -554,6 +554,16 @@ capabilities. All features occur as children of the main ``features`` element.
          <cbitpos>47</cbitpos>
          <reduced-phys-bits>1</reduced-phys-bits>
        </sev>
+       <sgx supported='yes'>
+         <flc>no</flc>
+         <sgx1>yes</sgx1>
+         <sgx2>no</sgx2>
+         <section_size>2</section_size>
+         <sections>
+           <section node='0' size='1'/>
+           <section node='1' size='1'/>
+         </sections>
+       </sgx>
      </features>
    </domainCapabilities>
 
@@ -633,3 +643,33 @@ in domain XML <formatdomain.html#launch-security>`__
 ``maxESGuests``
    The maximum number of SEV-ES guests that can be launched on the host. This
    value may be configurable in the firmware for some hosts.
+
+SGX capabilities
+^^^^^^^^^^^^^^^^
+
+Intel Software Guard Extensions (Intel SGX) capabilities are exposed under the
+``sgx`` element.
+
+Intel SGX helps protect data in use via unique application isolation technology.
+Protect selected code and data from modification using hardened enclaves with
+Intel SGX.
+
+For more details on the SGX feature, please follow resources in the SGX developer's
+document store. In order to use SGX with libvirt have a look at formatdomain.rst
+Memory devices.
+
+``flc``
+   FLC (Flexible Launch Control), not strictly part of SGX2, but was not part of
+   original SGX hardware either.
+
+``sgx1``
+   the sgx version 1.
+
+``sgx2``
+   The sgx version 2.
+
+``section_size``
+   The size of the SGX enclave page cache (called EPC).
+
+``sections``
+   The sections of the SGX enclave page cache (called EPC).
diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 1d3bba3019..ef41612494 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -99,6 +99,7 @@ virDomainCapsDispose(void *obj)
     virObjectUnref(caps->cpu.custom);
     virCPUDefFree(caps->cpu.hostModel);
     virSEVCapabilitiesFree(caps->sev);
+    virSGXCapabilitiesFree(caps->sgx);
 
     values = &caps->os.loader.values;
     for (i = 0; i < values->nvalues; i++)
@@ -621,6 +622,39 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
     virBufferAddLit(buf, "</sev>\n");
 }
 
+static void
+virDomainCapsFeatureSGXFormat(virBuffer *buf,
+                              const virSGXCapability *sgx)
+{
+    if (!sgx) {
+        virBufferAddLit(buf, "<sgx supported='no'/>\n");
+        return;
+    }
+
+    virBufferAddLit(buf, "<sgx supported='yes'>\n");
+    virBufferAdjustIndent(buf, 2);
+    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
+    virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", sgx->sgx1 ? "yes" : "no");
+    virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", sgx->sgx2 ? "yes" : "no");
+    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
+
+    if (sgx->nsections > 0) {
+        size_t i;
+
+        virBufferAddLit(buf, "<sections>\n");
+
+        for (i = 0; i < sgx->nsections; i++) {
+            virBufferAdjustIndent(buf, 2);
+            virBufferAsprintf(buf, "<section node='%d' ", sgx->sections[i].node);
+            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->sections[i].size);
+            virBufferAdjustIndent(buf, -2);
+        }
+        virBufferAddLit(buf, "</sections>\n");
+    }
+
+    virBufferAdjustIndent(buf, -2);
+    virBufferAddLit(buf, "</sgx>\n");
+}
 
 static void
 virDomainCapsFormatFeatures(const virDomainCaps *caps,
@@ -641,6 +675,7 @@ virDomainCapsFormatFeatures(const virDomainCaps *caps,
     }
 
     virDomainCapsFeatureSEVFormat(&childBuf, caps->sev);
+    virDomainCapsFeatureSGXFormat(&childBuf, caps->sgx);
 
     virXMLFormatElement(buf, "features", NULL, &childBuf);
 }
diff --git a/src/conf/schemas/domaincaps.rng b/src/conf/schemas/domaincaps.rng
index 9cbc2467ab..7aec9fbf85 100644
--- a/src/conf/schemas/domaincaps.rng
+++ b/src/conf/schemas/domaincaps.rng
@@ -270,6 +270,9 @@
       <optional>
         <ref name="sev"/>
       </optional>
+      <optional>
+        <ref name="sgx"/>
+      </optional>
     </element>
   </define>
 
@@ -330,6 +333,43 @@
     </element>
   </define>
 
+  <define name="sgx">
+    <element name="sgx">
+      <ref name="supported"/>
+      <optional>
+        <element name="flc">
+          <ref name="virYesNo"/>
+        </element>
+        <element name="sgx1">
+          <ref name="virYesNo"/>
+        </element>
+        <element name="sgx2">
+          <ref name="virYesNo"/>
+        </element>
+        <element name="section_size">
+          <attribute name="unit">
+            <value>KiB</value>
+          </attribute>
+          <data type="unsignedLong"/>
+        </element>
+        <optional>
+          <element name="sections">
+            <zeroOrMore>
+              <element name="section">
+                <attribute name="node">
+                  <data type="unsignedInt"/>
+                </attribute>
+                <attribute name="size">
+                  <data type="unsignedLong"/>
+                </attribute>
+              </element>
+            </zeroOrMore>
+          </element>
+        </optional>
+      </optional>
+    </element>
+  </define>
+
   <define name="value">
     <zeroOrMore>
       <element name="value">
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c734cd9439..ec6a4e5fb8 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -6730,6 +6730,21 @@ virQEMUCapsFillDomainFeatureS390PVCaps(virQEMUCaps *qemuCaps,
     }
 }
 
+/**
+ * virQEMUCapsFillDomainFeatureSGXCaps:
+ * @qemuCaps: QEMU capabilities
+ * @domCaps: domain capabilities
+ *
+ * Take the information about SGX capabilities that has been obtained
+ * using the 'query-sgx-capabilities' QMP command and stored in @qemuCaps
+ * and convert it to a form suitable for @domCaps.
+ */
+static void
+virQEMUCapsFillDomainFeatureSGXCaps(virQEMUCaps *qemuCaps,
+                                    virDomainCaps *domCaps)
+{
+    virQEMUCapsSGXInfoCopy(&domCaps->sgx, qemuCaps->sgxCapabilities);
+}
 
 int
 virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps,
@@ -6782,6 +6797,7 @@ virQEMUCapsFillDomainCaps(virQEMUCaps *qemuCaps,
     virQEMUCapsFillDomainFeatureGICCaps(qemuCaps, domCaps);
     virQEMUCapsFillDomainFeatureSEVCaps(qemuCaps, domCaps);
     virQEMUCapsFillDomainFeatureS390PVCaps(qemuCaps, domCaps);
+    virQEMUCapsFillDomainFeatureSGXCaps(qemuCaps, domCaps);
 
     return 0;
 }
diff --git a/tests/domaincapsdata/bhyve_basic.x86_64.xml b/tests/domaincapsdata/bhyve_basic.x86_64.xml
index 745f325531..dd054577c0 100644
--- a/tests/domaincapsdata/bhyve_basic.x86_64.xml
+++ b/tests/domaincapsdata/bhyve_basic.x86_64.xml
@@ -33,5 +33,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/bhyve_fbuf.x86_64.xml b/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
index bb11c02ae9..0b1d9c17d7 100644
--- a/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
+++ b/tests/domaincapsdata/bhyve_fbuf.x86_64.xml
@@ -50,5 +50,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/bhyve_uefi.x86_64.xml b/tests/domaincapsdata/bhyve_uefi.x86_64.xml
index dfd2360d74..69fff197a7 100644
--- a/tests/domaincapsdata/bhyve_uefi.x86_64.xml
+++ b/tests/domaincapsdata/bhyve_uefi.x86_64.xml
@@ -42,5 +42,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/empty.xml b/tests/domaincapsdata/empty.xml
index d3e2d89b60..97752ca04a 100644
--- a/tests/domaincapsdata/empty.xml
+++ b/tests/domaincapsdata/empty.xml
@@ -13,5 +13,6 @@
   </devices>
   <features>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/libxl-xenfv.xml b/tests/domaincapsdata/libxl-xenfv.xml
index cc5b3847e2..c71d759517 100644
--- a/tests/domaincapsdata/libxl-xenfv.xml
+++ b/tests/domaincapsdata/libxl-xenfv.xml
@@ -76,5 +76,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/libxl-xenpv.xml b/tests/domaincapsdata/libxl-xenpv.xml
index 325f1e50b3..8ae2370b7e 100644
--- a/tests/domaincapsdata/libxl-xenpv.xml
+++ b/tests/domaincapsdata/libxl-xenpv.xml
@@ -66,5 +66,6 @@
     <vmcoreinfo supported='no'/>
     <genid supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index c4277c53a1..381cc9a4ec 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index 2a65cb0ad9..28868f1c0b 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
index 8035f7230a..3176d7044f 100644
--- a/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.ppc64.xml
@@ -134,5 +134,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 6e3ddda356..db9bb1dd9f 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index 8f3911b4b3..b99301af1f 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index a4dc7bafc9..da58e85b72 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
index 7108efe3b4..65aa9403c5 100644
--- a/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
@@ -175,5 +175,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
index 1e7db635d0..d3e2ac0621 100644
--- a/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.aarch64.xml
@@ -169,5 +169,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
index f109d36266..076820c5bc 100644
--- a/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.ppc64.xml
@@ -135,5 +135,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.s390x.xml b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
index b810ad737a..821d467bd9 100644
--- a/tests/domaincapsdata/qemu_4.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.s390x.xml
@@ -232,5 +232,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index 24e732d9c3..3dac8ff1ae 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -207,5 +207,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 3ee7feea48..2f9dc00689 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -213,5 +213,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index b20c02cb68..13540675b6 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -229,5 +229,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 0f1d398e2c..bb7d6b9219 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -213,5 +213,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
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 c8a77cdd41..9fef4ccd37 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -221,5 +221,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
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 d0ee3f7b7a..76636c0c37 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -236,5 +236,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
index 05d606967b..1a87fc417b 100644
--- a/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-virt.aarch64.xml
@@ -177,5 +177,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
index f19ad5e6db..943c3605d8 100644
--- a/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.aarch64.xml
@@ -171,5 +171,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 4c3a2c6d98..e0187041db 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -141,5 +141,6 @@
     <backingStoreInput supported='no'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
index fb162ea578..8150e5119a 100644
--- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -247,5 +247,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 6578fd04b6..8f3edfce70 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -221,5 +221,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
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 8a6797c2f1..4c6ea67c99 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -223,5 +223,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx 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
index d277c96426..e0536347e5 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -238,5 +238,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index f8cea230d9..3a70b34001 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -186,5 +186,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index ab72b7ffeb..6a8c1027c0 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -180,5 +180,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index d196676b14..ec6c9d097a 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -147,5 +147,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx 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
index 51ca1d98e0..74f297c2e7 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -223,5 +223,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 3468fb2e72..ceafdd35e7 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 4f1ffbb2ba..ae9754a14c 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -238,5 +238,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0.sparc.xml b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
index 5c1c0c4680..ae8474a696 100644
--- a/tests/domaincapsdata/qemu_5.1.0.sparc.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.sparc.xml
@@ -113,5 +113,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 8ff49c7899..37d053c086 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 2301a475eb..4e68dc46f4 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 6cff0f815e..a8914a90b2 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -238,5 +238,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index a863a6052d..41bb7ecb45 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -186,5 +186,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index ab72b7ffeb..6a8c1027c0 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -180,5 +180,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index b2c0577be9..fa29ac8c23 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -147,5 +147,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
index 2a2ca8abcf..496c08dd34 100644
--- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -249,5 +249,6 @@
     <backup supported='no'/>
     <s390-pv supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 41a54985d7..df653b95e3 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -224,5 +224,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 4595e70f61..95627a1f9c 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -230,5 +230,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 65f4459bcb..4ac6365cad 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -244,5 +244,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 61eab9de0e..bda348ac18 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -187,5 +187,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index fa722b5fd3..d1478dedde 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -181,5 +181,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='no'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
index 13fa3a637e..ccb6536dfc 100644
--- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -250,5 +250,6 @@
     <backup supported='no'/>
     <s390-pv supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index a6fa374211..621cf5032c 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -230,5 +230,6 @@
       <maxGuests>59</maxGuests>
       <maxESGuests>450</maxESGuests>
     </sev>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index f4d0fcf673..93194d4f99 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 40bc875e3c..9828fb4192 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -239,5 +239,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 67fc449f5d..0948e9cf14 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -226,5 +226,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 9d68c0a404..f23ce1180a 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -226,5 +226,11 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index a439dda190..e9530e76e5 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -240,5 +240,11 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index f6045623f5..7494df031f 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -189,5 +189,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index 35e18adcd5..2946a36b04 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -183,5 +183,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index b07072778b..fb92d1fc5a 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -145,5 +145,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 0f89790b60..6d20218543 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -226,5 +226,11 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 4e6ff06125..5eff1a0ff9 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -228,5 +228,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index ed80a7892f..bd3fe5cf25 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -242,5 +242,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
index 7a8cb9f113..514f673e4c 100644
--- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -189,5 +189,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
index d48c87dc3a..797affc12f 100644
--- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -183,5 +183,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index ec171bcdd9..73816bcd85 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -147,5 +147,6 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='no'/>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index a20395c6d4..2a77af73eb 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -228,5 +228,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 4e96c5104a..6de62c1707 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -227,5 +227,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 46542c8b5b..5f3017d6b5 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -240,5 +240,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 02b43e318f..3a982d4659 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -227,5 +227,15 @@
     <backingStoreInput supported='yes'/>
     <backup supported='yes'/>
     <sev supported='no'/>
+    <sgx supported='yes'>
+      <flc>no</flc>
+      <sgx1>yes</sgx1>
+      <sgx2>no</sgx2>
+      <section_size unit='KiB'>2</section_size>
+      <sections>
+        <section node='0' size='1'/>
+        <section node='1' size='1'/>
+      </sections>
+    </sgx>
   </features>
 </domainCapabilities>
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:57 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:57 +0200
Subject: [PATCH v14 11/15] conf: Introduce SGX EPC element into device memory
 xml
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <d692188ec7f4ef9c4b90d73a4263c4214b8f433d.1658917570.git.mprivozn@redhat.com>

From: Lin Yang <lin.a.yang at intel.com>

With NUMA config:

<devices>
  ...
  <memory model='sgx-epc'>
    <source>
      <nodemask>0-1</nodemask>
    </source>
    <target>
      <size unit='KiB'>512</size>
      <node>0</node>
    </target>
  </memory>
  ...
</devices>

Without NUMA config:

<devices>
  ...
  <memory model='sgx-epc'>
    <target>
      <size unit='KiB'>512</size>
    </target>
  </memory>
  ...
</devices>

Signed-off-by: Lin Yang <lin.a.yang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 docs/formatdomain.rst                         | 25 +++++++-
 src/conf/domain_conf.c                        | 30 +++++++++
 src/conf/domain_conf.h                        |  1 +
 src/conf/domain_postparse.c                   |  1 +
 src/conf/domain_validate.c                    |  9 +++
 src/conf/schemas/domaincommon.rng             |  1 +
 src/qemu/qemu_alias.c                         |  3 +
 src/qemu/qemu_command.c                       |  1 +
 src/qemu/qemu_domain.c                        | 48 ++++++++++----
 src/qemu/qemu_domain_address.c                |  6 ++
 src/qemu/qemu_driver.c                        |  1 +
 src/qemu/qemu_process.c                       |  2 +
 src/qemu/qemu_validate.c                      |  8 +++
 src/security/security_apparmor.c              |  1 +
 src/security/security_dac.c                   |  2 +
 src/security/security_selinux.c               |  2 +
 tests/qemuxml2argvdata/sgx-epc-numa.xml       | 64 +++++++++++++++++++
 tests/qemuxml2argvdata/sgx-epc.xml            | 52 +++++++++++++++
 .../sgx-epc-numa.x86_64-latest.xml            |  1 +
 .../sgx-epc.x86_64-6.2.0.xml                  |  1 +
 tests/qemuxml2xmltest.c                       |  3 +
 21 files changed, 247 insertions(+), 15 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.xml
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.xml
 create mode 120000 tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 1ed969ac3e..bdd0fcea8e 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -7940,6 +7940,20 @@ Example: usage of the memory devices
          <current unit='KiB'>524288</current>
        </target>
      </memory>
+     <memory model='sgx-epc'>
+       <source>
+         <nodemask>0-1</nodemask>
+       </source>
+       <target>
+         <size unit='KiB'>16384</size>
+         <node>0</node>
+       </target>
+     </memory>
+     <memory model='sgx-epc'>
+       <target>
+         <size unit='KiB'>16384</size>
+       </target>
+     </memory>
    </devices>
    ...
 
@@ -7948,7 +7962,9 @@ Example: usage of the memory devices
    1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.
    :since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized
    persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model
-   to add paravirtualized memory device. :since:`Since 7.9.0`
+   to add paravirtualized memory device. :since:`Since 7.9.0` Provide
+   ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.
+   :since:`Since 8.7.0 and QEMU 6.2.0`
 
 ``access``
    An optional attribute ``access`` ( :since:`since 3.2.0` ) that provides
@@ -8008,6 +8024,13 @@ Example: usage of the memory devices
      Represents a path in the host that backs the virtio memory module in the
      guest. It is mandatory.
 
+   For model ``sgx-epc`` this element is optional. The following optional
+   elements may be used:
+
+   ``nodemask``
+      This element can be used to override the default set of NUMA nodes where
+      the memory would be allocated. :since:`Since 8.7.0 and QEMU 7.0.0`
+
 ``target``
    The mandatory ``target`` element configures the placement and sizing of the
    added memory from the perspective of the guest.
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index e85cc1f809..a1f64b4fcb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1440,6 +1440,7 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
               "nvdimm",
               "virtio-pmem",
               "virtio-mem",
+              "sgx-epc",
 );
 
 VIR_ENUM_IMPL(virDomainShmemModel,
@@ -13303,6 +13304,20 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
         def->nvdimmPath = virXPathString("string(./path)", ctxt);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if ((nodemask = virXPathString("string(./nodemask)", ctxt))) {
+            if (virBitmapParse(nodemask, &def->sourceNodes,
+                               VIR_DOMAIN_CPUMASK_LEN) < 0)
+                return -1;
+
+            if (virBitmapIsAllClear(def->sourceNodes)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("Invalid value of 'nodemask': %s"), nodemask);
+                return -1;
+            }
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -13371,6 +13386,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
     }
@@ -15167,6 +15183,11 @@ virDomainMemoryFindByDefInternal(virDomainDef *def,
                 continue;
             break;
 
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            if (!virBitmapEqual(tmp->sourceNodes, mem->sourceNodes))
+                continue;
+            break;
+
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
@@ -24778,6 +24799,15 @@ virDomainMemorySourceDefFormat(virBuffer *buf,
         virBufferEscapeString(&childBuf, "<path>%s</path>\n", def->nvdimmPath);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (def->sourceNodes) {
+            if (!(bitmap = virBitmapFormat(def->sourceNodes)))
+                return -1;
+
+            virBufferAsprintf(&childBuf, "<nodemask>%s</nodemask>\n", bitmap);
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 060c395943..4fda47118f 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2573,6 +2573,7 @@ typedef enum {
     VIR_DOMAIN_MEMORY_MODEL_NVDIMM, /* nvdimm memory device */
     VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM, /* virtio-pmem memory device */
     VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM, /* virtio-mem memory device */
+    VIR_DOMAIN_MEMORY_MODEL_SGX_EPC, /* SGX enclave page cache */
 
     VIR_DOMAIN_MEMORY_MODEL_LAST
 } virDomainMemoryModel;
diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
index df59de2d0d..9a3e8f494c 100644
--- a/src/conf/domain_postparse.c
+++ b/src/conf/domain_postparse.c
@@ -645,6 +645,7 @@ virDomainMemoryDefPostParse(virDomainMemoryDef *mem,
         break;
 
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index e673e4b81a..bc24c68a05 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -2334,6 +2334,15 @@ virDomainMemoryDefValidate(const virDomainMemoryDef *mem,
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (mem->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("memory device address is not supported for model '%s'"),
+                           virDomainMemoryModelTypeToString(mem->model));
+            return -1;
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     default:
diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index c4f293a4c3..ca779ba66b 100644
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -6838,6 +6838,7 @@
           <value>nvdimm</value>
           <value>virtio-pmem</value>
           <value>virtio-mem</value>
+          <value>sgx-epc</value>
         </choice>
       </attribute>
       <optional>
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 7b91fe3141..e7f76068cb 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -515,6 +515,9 @@ qemuAssignDeviceMemoryAlias(virDomainDef *def,
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
         prefix = "virtiomem";
         break;
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        prefix = "epc";
+        break;
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     default:
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 8699b88220..f3f6870c58 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4001,6 +4001,7 @@ qemuBuildMemoryDeviceProps(virQEMUDriverConfig *cfg,
             return NULL;
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     default:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b02ffc9a2e..fb287a9623 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8449,6 +8449,7 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriver *driver,
             break;
 
         case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
@@ -9130,6 +9131,12 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
         }
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                       _("hotplug is not supported for the %s device"),
+                       virDomainMemoryModelTypeToString(mem->model));
+            return -1;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         return -1;
@@ -9165,7 +9172,7 @@ int
 qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
                                    const virDomainMemoryDef *mem)
 {
-    unsigned int nmems = def->nmems;
+    unsigned int hotplugNum = 0;
     unsigned long long hotplugSpace;
     unsigned long long hotplugMemory = 0;
     size_t i;
@@ -9173,15 +9180,37 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
     hotplugSpace = def->mem.max_memory - virDomainDefGetMemoryInitial(def);
 
     if (mem) {
-        nmems++;
+        hotplugNum++;
         hotplugMemory = mem->size;
 
         if (qemuDomainDefValidateMemoryHotplugDevice(mem, def) < 0)
             return -1;
     }
 
+    for (i = 0; i < def->nmems; i++) {
+        switch (def->mems[i]->model) {
+        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+            hotplugMemory += def->mems[i]->size;
+            hotplugNum++;
+            /* already existing devices don't need to be checked on hotplug */
+            if (!mem &&
+                qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)
+                return -1;
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            /* sgx epc memory does not support hotplug */
+        case VIR_DOMAIN_MEMORY_MODEL_LAST:
+        case VIR_DOMAIN_MEMORY_MODEL_NONE:
+            break;
+        }
+    }
+
     if (!virDomainDefHasMemoryHotplug(def)) {
-        if (nmems) {
+        if (hotplugNum) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("cannot use/hotplug a memory device when domain "
                              "'maxMemory' is not defined"));
@@ -9204,22 +9233,13 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
         }
     }
 
-    if (nmems > def->mem.memory_slots) {
+    if (hotplugNum > def->mem.memory_slots) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("memory device count '%u' exceeds slots count '%u'"),
-                       nmems, def->mem.memory_slots);
+                       hotplugNum, def->mem.memory_slots);
         return -1;
     }
 
-    for (i = 0; i < def->nmems; i++) {
-        hotplugMemory += def->mems[i]->size;
-
-        /* already existing devices don't need to be checked on hotplug */
-        if (!mem &&
-            qemuDomainDefValidateMemoryHotplugDevice(def->mems[i], def) < 0)
-            return -1;
-    }
-
     if (hotplugMemory > hotplugSpace) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                        _("memory device total size exceeds hotplug space"));
diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 026be99ba9..08cc995bfa 100644
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -389,6 +389,7 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
         }
@@ -1039,6 +1040,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             return 0;
         }
@@ -2421,6 +2423,7 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_DIMM:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
         }
@@ -3081,6 +3084,7 @@ qemuDomainAssignMemoryDeviceSlot(virDomainObj *vm,
         return qemuDomainEnsurePCIAddress(vm, &dev);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -3107,6 +3111,7 @@ qemuDomainReleaseMemoryDeviceSlot(virDomainObj *vm,
         qemuDomainReleaseDeviceAddress(vm, &mem->info);
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
@@ -3140,6 +3145,7 @@ qemuDomainAssignMemorySlots(virDomainDef *def)
         case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
             /* handled in qemuDomainAssignPCIAddresses() */
             break;
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 9013e6fb8d..530011fe4a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -7170,6 +7170,7 @@ qemuDomainChangeMemoryLiveValidateChange(const virDomainMemoryDef *oldDef,
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("cannot modify memory of model '%s'"),
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d42333195a..554eb482fb 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3936,6 +3936,7 @@ qemuProcessDomainMemoryDefNeedHugepagesPath(const virDomainMemoryDef *mem,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         /* None of these can be backed by hugepages. */
         return false;
@@ -4010,6 +4011,7 @@ qemuProcessNeedMemoryBackingPath(virDomainDef *def,
         case VIR_DOMAIN_MEMORY_MODEL_NONE:
         case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
         case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
         case VIR_DOMAIN_MEMORY_MODEL_LAST:
             /* Backed by user provided path. Not stored in memory
              * backing dir anyway. */
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 764d5b029e..259636f7e7 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -5181,6 +5181,14 @@ qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
         }
         break;
 
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("sgx epc isn't supported by this QEMU binary"));
+            return -1;
+        }
+        break;
+
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
index 008384dee8..36e8ce42b5 100644
--- a/src/security/security_apparmor.c
+++ b/src/security/security_apparmor.c
@@ -687,6 +687,7 @@ AppArmorSetMemoryLabel(virSecurityManager *mgr,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
     }
diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index 21cebae694..d94995c9cf 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -1853,6 +1853,7 @@ virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
         ret = 0;
@@ -2040,6 +2041,7 @@ virSecurityDACSetMemoryLabel(virSecurityManager *mgr,
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
         ret = 0;
diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index 9f2872decc..98044d1847 100644
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -1580,6 +1580,7 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr,
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         break;
     }
@@ -1608,6 +1609,7 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr,
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
         ret = 0;
diff --git a/tests/qemuxml2argvdata/sgx-epc-numa.xml b/tests/qemuxml2argvdata/sgx-epc-numa.xml
new file mode 100644
index 0000000000..9029977f20
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc-numa.xml
@@ -0,0 +1,64 @@
+<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'>2</vcpu>
+  <os>
+    <type arch='x86_64' machine='q35'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+    <numa>
+      <cell id='0' cpus='0' memory='109550' unit='KiB'/>
+      <cell id='1' cpus='1' memory='109550' 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='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='usb' index='0' model='none'/>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </memballoon>
+    <memory model='sgx-epc'>
+      <source>
+        <nodemask>0-1</nodemask>
+      </source>
+      <target>
+        <size unit='KiB'>65536</size>
+        <node>0</node>
+      </target>
+    </memory>
+    <memory model='sgx-epc'>
+      <source>
+        <nodemask>2-3</nodemask>
+      </source>
+      <target>
+        <size unit='KiB'>16384</size>
+        <node>1</node>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/sgx-epc.xml b/tests/qemuxml2argvdata/sgx-epc.xml
new file mode 100644
index 0000000000..8b46a799dc
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc.xml
@@ -0,0 +1,52 @@
+<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='x86_64' machine='pc-q35-6.2'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
+    <controller type='pci' index='0' model='pcie-root'/>
+    <controller type='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='usb' index='0' model='none'/>
+    <controller type='sata' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+    </controller>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
+    <memballoon model='virtio'>
+      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+    </memballoon>
+    <memory model='sgx-epc'>
+      <target>
+        <size unit='KiB'>65536</size>
+      </target>
+    </memory>
+    <memory model='sgx-epc'>
+      <target>
+        <size unit='KiB'>16384</size>
+      </target>
+    </memory>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml b/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
new file mode 120000
index 0000000000..fa27d9b2a2
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/sgx-epc-numa.x86_64-latest.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/sgx-epc-numa.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml
new file mode 120000
index 0000000000..cc2263ac99
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/sgx-epc.x86_64-6.2.0.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/sgx-epc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4cbf380e44..033efad646 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1462,6 +1462,9 @@ mymain(void)
     DO_TEST_CAPS_LATEST("channel-qemu-vdagent");
     DO_TEST_CAPS_LATEST("channel-qemu-vdagent-features");
 
+    DO_TEST_CAPS_VER("sgx-epc", "6.2.0");
+    DO_TEST_CAPS_LATEST("sgx-epc-numa");
+
  cleanup:
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(fakerootdir);
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:55 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:55 +0200
Subject: [PATCH v14 09/15] Convert QMP capabilities to domain capabilities
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <a003713dba87682cb1c2700a2e3de1174940c936.1658917570.git.mprivozn@redhat.com>

From: Haibin Huang <haibin.huang at intel.com>

the QMP capabilities:
  {"return":
    {
      "sgx": true,
      "section-size": 1024,
      "flc": true
    }
  }

the domain capabilities:
  <sgx>
    <flc>yes</flc>
    <epc_size>1</epc_size>
  </sgx>

Signed-off-by: Haibin Huang <haibin.huang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_capabilities.c                  | 206 ++++++++++++++++++
 src/qemu/qemu_capabilities.h                  |   6 +
 .../caps_6.2.0.x86_64.replies                 |  24 +-
 .../caps_6.2.0.x86_64.xml                     |   7 +
 .../caps_7.0.0.x86_64.replies                 |  34 ++-
 .../caps_7.0.0.x86_64.xml                     |  11 +
 .../caps_7.1.0.x86_64.replies                 |  34 ++-
 .../caps_7.1.0.x86_64.xml                     |  11 +
 8 files changed, 321 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b002fb98ed..c734cd9439 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -673,6 +673,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "iothread.thread-pool-max", /* QEMU_CAPS_IOTHREAD_THREAD_POOL_MAX */
               "usb-host.guest-resets-all", /* QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL */
               "migration.blocked-reasons", /* QEMU_CAPS_MIGRATION_BLOCKED_REASONS */
+
+              /* 435 */
+              "sgx-epc", /* QEMU_CAPS_SGX_EPC */
     );
 
 
@@ -754,6 +757,8 @@ struct _virQEMUCaps {
 
     virSEVCapability *sevCapabilities;
 
+    virSGXCapability *sgxCapabilities;
+
     /* Capabilities which may differ depending on the accelerator. */
     virQEMUCapsAccel kvm;
     virQEMUCapsAccel hvf;
@@ -1396,6 +1401,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "s390-pv-guest", QEMU_CAPS_S390_PV_GUEST },
     { "virtio-mem-pci", QEMU_CAPS_DEVICE_VIRTIO_MEM_PCI },
     { "virtio-iommu-pci", QEMU_CAPS_DEVICE_VIRTIO_IOMMU_PCI },
+    { "sgx-epc", QEMU_CAPS_SGX_EPC },
 };
 
 
@@ -1973,6 +1979,36 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst,
 }
 
 
+static int
+virQEMUCapsSGXInfoCopy(virSGXCapability **dst,
+                       virSGXCapability *src)
+{
+    g_autoptr(virSGXCapability) tmp = NULL;
+
+    if (!src) {
+        *dst = NULL;
+        return 0;
+    }
+
+    tmp = g_new0(virSGXCapability, 1);
+
+    tmp->flc = src->flc;
+    tmp->sgx1 = src->sgx1;
+    tmp->sgx2 = src->sgx2;
+    tmp->section_size = src->section_size;
+
+    if (src->nsections > 0) {
+        tmp->sections = g_new0(virSection, src->nsections);
+        memcpy(tmp->sections, src->sections,
+               src->nsections * sizeof(*tmp->sections));
+        tmp->nsections = src->nsections;
+    }
+
+    *dst = g_steal_pointer(&tmp);
+    return 0;
+}
+
+
 static void
 virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
                                  virQEMUCapsAccel *src)
@@ -2054,6 +2090,12 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
                                qemuCaps->sevCapabilities) < 0)
         return NULL;
 
+
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) &&
+        virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities,
+                               qemuCaps->sgxCapabilities) < 0)
+        return NULL;
+
     return g_steal_pointer(&ret);
 }
 
@@ -2092,6 +2134,7 @@ void virQEMUCapsDispose(void *obj)
     virCPUDataFree(qemuCaps->cpuData);
 
     virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
+    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
 
     virQEMUCapsAccelClear(&qemuCaps->kvm);
     virQEMUCapsAccelClear(&qemuCaps->hvf);
@@ -2617,6 +2660,13 @@ virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps)
 }
 
 
+virSGXCapability *
+virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps)
+{
+    return qemuCaps->sgxCapabilities;
+}
+
+
 static int
 virQEMUCapsProbeQMPCommands(virQEMUCaps *qemuCaps,
                             qemuMonitor *mon)
@@ -3443,6 +3493,31 @@ virQEMUCapsProbeQMPSEVCapabilities(virQEMUCaps *qemuCaps,
 }
 
 
+static int
+virQEMUCapsProbeQMPSGXCapabilities(virQEMUCaps *qemuCaps,
+                                   qemuMonitor *mon)
+{
+    int rc = -1;
+    virSGXCapability *caps = NULL;
+
+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
+        return 0;
+
+    if ((rc = qemuMonitorGetSGXCapabilities(mon, &caps)) < 0)
+        return -1;
+
+    /* SGX isn't actually supported */
+    if (rc == 0) {
+        virQEMUCapsClear(qemuCaps, QEMU_CAPS_SGX_EPC);
+        return 0;
+    }
+
+    virSGXCapabilitiesFree(qemuCaps->sgxCapabilities);
+    qemuCaps->sgxCapabilities = caps;
+    return 0;
+}
+
+
 /*
  * Filter for features which should never be passed to QEMU. Either because
  * QEMU never supported them or they were dropped as they never did anything
@@ -4221,6 +4296,98 @@ virQEMUCapsParseSEVInfo(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
 }
 
 
+static int
+virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
+                        xmlXPathContextPtr ctxt)
+{
+    g_autoptr(virSGXCapability) sgx = NULL;
+    xmlNodePtr sections = NULL;
+    g_autofree char *flc = NULL;
+    g_autofree char *sgx1 = NULL;
+    g_autofree char *sgx2 = NULL;
+
+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
+        return 0;
+
+    if (virXPathBoolean("boolean(./sgx)", ctxt) == 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing SGX platform data in QEMU capabilities cache"));
+        return -1;
+    }
+
+    sgx = g_new0(virSGXCapability, 1);
+
+    if ((!(flc = virXPathString("string(./sgx/flc)", ctxt))) ||
+        virStringParseYesNo(flc, &sgx->flc) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or invalid SGX platform flc in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if ((!(sgx1 = virXPathString("string(./sgx/sgx1)", ctxt))) ||
+        virStringParseYesNo(sgx1, &sgx->sgx1) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or invalid SGX platform sgx1 in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if ((!(sgx2 = virXPathString("string(./sgx/sgx2)", ctxt))) ||
+        virStringParseYesNo(sgx2, &sgx->sgx2) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or invalid SGX platform sgx2 in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if (virXPathULongLong("string(./sgx/section_size)", ctxt,
+                          &sgx->section_size) < 0) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing or malformed SGX platform section_size in QEMU capabilities cache"));
+        return -1;
+    }
+
+    if ((sections = virXPathNode("./sgx/sections", ctxt))) {
+        g_autofree xmlNodePtr *sectionNodes = NULL;
+        int nsections = 0;
+        size_t i;
+        VIR_XPATH_NODE_AUTORESTORE(ctxt);
+
+        ctxt->node = sections;
+        nsections = virXPathNodeSet("./section", ctxt, &sectionNodes);
+
+        if (nsections < 0) {
+            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                           _("failed to parse SGX sections in QEMU capabilities cache"));
+            return -1;
+        }
+
+        sgx->nsections = nsections;
+        sgx->sections = g_new0(virSection, nsections);
+
+        for (i = 0; i < nsections; i++) {
+            g_autofree char * strNode = NULL;
+            g_autofree char * strSize = NULL;
+
+            if (!(strNode = virXMLPropString(sectionNodes[i], "node")) ||
+                virStrToLong_i(strNode, NULL, 10, &sgx->sections[i].node) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("missing node name in QEMU capabilities cache"));
+                return -1;
+            }
+
+            if (!(strSize = virXMLPropString(sectionNodes[i], "size")) ||
+                virStrToLong_ull(strSize, NULL, 10, &(sgx->sections[i].size)) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("missing size name in QEMU capabilities cache"));
+                return -1;
+            }
+        }
+    }
+
+    qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
+    return 0;
+}
+
+
 static int
 virQEMUCapsParseFlags(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
 {
@@ -4523,6 +4690,9 @@ virQEMUCapsLoadCache(virArch hostArch,
     if (virQEMUCapsParseSEVInfo(qemuCaps, ctxt) < 0)
         return -1;
 
+    if (virQEMUCapsParseSGXInfo(qemuCaps, ctxt) < 0)
+        return -1;
+
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM))
         virQEMUCapsInitHostCPUModel(qemuCaps, hostArch, VIR_DOMAIN_VIRT_KVM);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_HVF))
@@ -4708,6 +4878,37 @@ virQEMUCapsFormatSEVInfo(virQEMUCaps *qemuCaps, virBuffer *buf)
 }
 
 
+static void
+virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
+                         virBuffer *buf)
+{
+    virSGXCapability *sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
+
+    virBufferAddLit(buf, "<sgx supported='yes'>\n");
+    virBufferAdjustIndent(buf, 2);
+    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
+    virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", sgx->sgx1 ? "yes" : "no");
+    virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", sgx->sgx2 ? "yes" : "no");
+    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
+
+    if (sgx->nsections > 0) {
+        size_t i;
+        virBufferAddLit(buf, "<sections>\n");
+
+        for (i = 0; i < sgx->nsections; i++) {
+            virBufferAdjustIndent(buf, 2);
+            virBufferAsprintf(buf, "<section node='%u' ", sgx->sections[i].node);
+            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->sections[i].size);
+            virBufferAdjustIndent(buf, -2);
+        }
+        virBufferAddLit(buf, "</sections>\n");
+    }
+
+    virBufferAdjustIndent(buf, -2);
+    virBufferAddLit(buf, "</sgx>\n");
+}
+
+
 char *
 virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
 {
@@ -4789,6 +4990,9 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
     if (qemuCaps->sevCapabilities)
         virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
 
+    if (qemuCaps->sgxCapabilities)
+        virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
+
     if (qemuCaps->kvmSupportsNesting)
         virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
 
@@ -5456,6 +5660,8 @@ virQEMUCapsInitQMPMonitor(virQEMUCaps *qemuCaps,
         return -1;
     if (virQEMUCapsProbeQMPSEVCapabilities(qemuCaps, mon) < 0)
         return -1;
+    if (virQEMUCapsProbeQMPSGXCapabilities(qemuCaps, mon) < 0)
+        return -1;
 
     virQEMUCapsInitProcessCaps(qemuCaps);
 
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 8f3090e2ce..a564bec037 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -653,6 +653,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_USB_HOST_GUESTS_RESETS_ALL, /* -device usb-host.guest-resets-all */
     QEMU_CAPS_MIGRATION_BLOCKED_REASONS, /* query-migrate returns 'blocked-reasons */
 
+    /* 435 */
+    QEMU_CAPS_SGX_EPC, /* -object sgx-epc,... */
+
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 
@@ -845,6 +848,9 @@ virQEMUCapsCPUFeatureFromQEMU(virQEMUCaps *qemuCaps,
 virSEVCapability *
 virQEMUCapsGetSEVCapabilities(virQEMUCaps *qemuCaps);
 
+virSGXCapability *
+virQEMUCapsGetSGXCapabilities(virQEMUCaps *qemuCaps);
+
 bool
 virQEMUCapsGetKVMSupportsSecureGuest(virQEMUCaps *qemuCaps) G_NO_INLINE;
 
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
index e235532d62..57558dcd3f 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.replies
@@ -32707,6 +32707,22 @@
   }
 }
 
+{
+  "execute": "query-sgx-capabilities",
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "sgx": true,
+    "flc": false,
+    "sgx1": true,
+    "sgx2": false,
+    "section-size": 2048
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -32715,7 +32731,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33048,7 +33064,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33062,7 +33078,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -33395,7 +33411,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 1a1a9643d4..eb81917472 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -237,6 +237,7 @@
   <flag name='chardev.qemu-vdagent'/>
   <flag name='usb-host.guest-resets-all'/>
   <flag name='migration.blocked-reasons'/>
+  <flag name='sgx-epc'/>
   <version>6002000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
@@ -3705,4 +3706,10 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <sgx supported='yes'>
+    <flc>no</flc>
+    <sgx1>yes</sgx1>
+    <sgx2>no</sgx2>
+    <section_size unit='KiB'>2</section_size>
+  </sgx>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
index 620442704a..9f806412f7 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.replies
@@ -33317,6 +33317,32 @@
   }
 }
 
+{
+  "execute": "query-sgx-capabilities",
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "sgx": true,
+    "flc": false,
+    "sgx1": true,
+    "sgx2": false,
+    "section-size": 2048,
+    "sections": [
+      {
+        "node": 0,
+        "size": 1024
+      },
+      {
+        "node": 1,
+        "size": 1024
+      }
+    ]
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -33325,7 +33351,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33662,7 +33688,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -33676,7 +33702,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -34013,7 +34039,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 8ce423557e..9a9e15c1fa 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -242,6 +242,7 @@
   <flag name='display-dbus'/>
   <flag name='usb-host.guest-resets-all'/>
   <flag name='migration.blocked-reasons'/>
+  <flag name='sgx-epc'/>
   <version>7000000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100243</microcodeVersion>
@@ -3770,4 +3771,14 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <sgx supported='yes'>
+    <flc>no</flc>
+    <sgx1>yes</sgx1>
+    <sgx2>no</sgx2>
+    <section_size unit='KiB'>2</section_size>
+    <sections>
+      <section node='0' size='1'/>
+      <section node='1' size='1'/>
+    </sections>
+  </sgx>
 </qemuCaps>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
index d893d67ea8..c221b9e034 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
@@ -34006,6 +34006,32 @@
   }
 }
 
+{
+  "execute": "query-sgx-capabilities",
+  "id": "libvirt-51"
+}
+
+{
+  "return": {
+    "sgx": true,
+    "flc": false,
+    "sgx1": true,
+    "sgx2": false,
+    "section-size": 2048,
+    "sections": [
+      {
+        "node": 0,
+        "size": 1024
+      },
+      {
+        "node": 1,
+        "size": 1024
+      }
+    ]
+  },
+  "id": "libvirt-51"
+}
+
 {
   "execute": "query-cpu-model-expansion",
   "arguments": {
@@ -34014,7 +34040,7 @@
       "name": "host"
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -34352,7 +34378,7 @@
       }
     }
   },
-  "id": "libvirt-51"
+  "id": "libvirt-52"
 }
 
 {
@@ -34366,7 +34392,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
@@ -34704,7 +34730,7 @@
       }
     }
   },
-  "id": "libvirt-52"
+  "id": "libvirt-53"
 }
 
 {
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 2e30fc5f2e..549f642db9 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -243,6 +243,7 @@
   <flag name='iothread.thread-pool-max'/>
   <flag name='usb-host.guest-resets-all'/>
   <flag name='migration.blocked-reasons'/>
+  <flag name='sgx-epc'/>
   <version>7000050</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>43100244</microcodeVersion>
@@ -3568,4 +3569,14 @@
   <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <sgx supported='yes'>
+    <flc>no</flc>
+    <sgx1>yes</sgx1>
+    <sgx2>no</sgx2>
+    <section_size unit='KiB'>2</section_size>
+    <sections>
+      <section node='0' size='1'/>
+      <section node='1' size='1'/>
+    </sections>
+  </sgx>
 </qemuCaps>
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:59 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:59 +0200
Subject: [PATCH v14 13/15] qemu_namespace: Create SGX related nodes in
 domain's namespace
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <57c62ec15ecc9d8c0894f3128e1ef878a3b39985.1658917571.git.mprivozn@redhat.com>

This is similar to the previous commit. SGX memory backend needs
to access /dev/sgx_vepc and /dev/sgx_provision. Create these
nodes in domain's private /dev when required by domain's config.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_namespace.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_namespace.c b/src/qemu/qemu_namespace.c
index 98cd794666..8fba39a690 100644
--- a/src/qemu/qemu_namespace.c
+++ b/src/qemu/qemu_namespace.c
@@ -350,11 +350,23 @@ static int
 qemuDomainSetupMemory(virDomainMemoryDef *mem,
                       GSList **paths)
 {
-    if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM &&
-        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM)
-        return 0;
+    switch (mem->model) {
+    case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        *paths = g_slist_prepend(*paths, g_strdup(mem->nvdimmPath));
+        break;
 
-    *paths = g_slist_prepend(*paths, g_strdup(mem->nvdimmPath));
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        *paths = g_slist_prepend(*paths, g_strdup(QEMU_DEV_SGX_VEPVC));
+        *paths = g_slist_prepend(*paths, g_strdup(QEMU_DEV_SGX_PROVISION));
+        break;
+
+    case VIR_DOMAIN_MEMORY_MODEL_NONE:
+    case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_LAST:
+        break;
+    }
 
     return 0;
 }
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:35:01 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:35:01 +0200
Subject: [PATCH v14 15/15] qemu: Add command-line to generate SGX EPC memory
 backend
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <a674efd852c5e90cbca21d1e6e92e269f31fe431.1658917571.git.mprivozn@redhat.com>

From: Lin Yang <lin.a.yang at intel.com>

According to the result parsing from xml, add the argument of
SGX EPC memory backend into QEMU command line.

With NUMA config:

    #qemu-system-x86_64 \
        ...... \
        -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
        -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \
        -machine sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1

Without NUMA config:

    #qemu-system-x86_64 \
        ...... \
        -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
        -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \
        -machine sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1

Signed-off-by: Lin Yang <lin.a.yang at intel.com>
Signed-off-by: Haibin Huang <haibin.huang at intel.com>
Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_alias.c                         |  3 +-
 src/qemu/qemu_command.c                       | 82 +++++++++++++++++--
 src/qemu/qemu_monitor_json.c                  | 41 ++++++++--
 .../sgx-epc-numa.x86_64-latest.args           | 40 +++++++++
 .../sgx-epc.x86_64-6.2.0.args                 | 37 +++++++++
 tests/qemuxml2argvtest.c                      |  3 +
 6 files changed, 190 insertions(+), 16 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args

diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index e7f76068cb..273b97697f 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -466,7 +466,8 @@ qemuDeviceMemoryGetAliasID(virDomainDef *def,
      * valid */
     if (!oldAlias &&
         mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM &&
-        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM)
+        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM &&
+        mem->model != VIR_DOMAIN_MEMORY_MODEL_SGX_EPC)
         return mem->info.addr.dimm.slot;
 
     for (i = 0; i < def->nmems; i++) {
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f3f6870c58..304a2ae6d1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3718,7 +3718,11 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps,
 
     props = virJSONValueNewObject();
 
-    if (!mem->nvdimmPath &&
+    if (mem->model == VIR_DOMAIN_MEMORY_MODEL_SGX_EPC) {
+        backendType = "memory-backend-epc";
+        if (!priv->memPrealloc)
+            prealloc = true;
+    } else if (!mem->nvdimmPath &&
         def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_MEMFD) {
         backendType = "memory-backend-memfd";
 
@@ -3733,7 +3737,6 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps,
 
         if (systemMemory)
             disableCanonicalPath = true;
-
     } else if (useHugepage || mem->nvdimmPath || memAccess ||
         def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {
 
@@ -7080,6 +7083,9 @@ qemuAppendDomainMemoryMachineParams(virBuffer *buf,
                                     const virDomainDef *def,
                                     virQEMUCaps *qemuCaps)
 {
+    virSGXCapability *sgxCaps = virQEMUCapsGetSGXCapabilities(qemuCaps);
+    bool nvdimmAdded = false;
+    int epcNum = 0;
     size_t i;
 
     if (def->mem.dump_core) {
@@ -7094,8 +7100,52 @@ qemuAppendDomainMemoryMachineParams(virBuffer *buf,
         virBufferAddLit(buf, ",mem-merge=off");
 
     for (i = 0; i < def->nmems; i++) {
-        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
-            virBufferAddLit(buf, ",nvdimm=on");
+        int targetNode = def->mems[i]->targetNode;
+
+        switch (def->mems[i]->model) {
+        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+            if (!nvdimmAdded) {
+                virBufferAddLit(buf, ",nvdimm=on");
+                nvdimmAdded = true;
+            }
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            /* add sgx epc memory to -machine parameter */
+
+            if (targetNode < 0) {
+                /* set NUMA target node to 0 by default if user doesn't
+                 * specify it. */
+                targetNode = 0;
+            }
+
+            if (sgxCaps->nsections == 0) {
+                /* Assume QEMU cannot specify guest NUMA node for each SGX EPC,
+                 * because it doesn't provide EPC NUMA info
+                 */
+                if (targetNode > 0) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                   _("can't add SGX EPC for guest node '%d' because this QEMU version didn't provide SGX EPC NUMA info"),
+                                   targetNode);
+                    return -1;
+                }
+
+                virBufferAsprintf(buf, ",sgx-epc.%d.memdev=mem%s",
+                                  epcNum, def->mems[i]->info.alias);
+            } else {
+                /* The .node attribute is required since QEMU provide EPC NUMA info */
+                virBufferAsprintf(buf, ",sgx-epc.%d.memdev=mem%s,sgx-epc.%d.node=%d",
+                                  epcNum, def->mems[i]->info.alias, epcNum, targetNode);
+            }
+
+            epcNum++;
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+        case VIR_DOMAIN_MEMORY_MODEL_NONE:
+        case VIR_DOMAIN_MEMORY_MODEL_LAST:
             break;
         }
     }
@@ -7813,11 +7863,27 @@ qemuBuildMemoryDeviceCommandLine(virCommand *cmd,
         if (qemuBuildMemoryDimmBackendStr(cmd, def->mems[i], def, cfg, priv) < 0)
             return -1;
 
-        if (!(props = qemuBuildMemoryDeviceProps(cfg, priv, def, def->mems[i])))
-            return -1;
+        switch (def->mems[i]->model) {
+        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+            if (!(props = qemuBuildMemoryDeviceProps(cfg, priv, def, def->mems[i])))
+                return -1;
 
-        if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, priv->qemuCaps) < 0)
-            return -1;
+            if (qemuBuildDeviceCommandlineFromJSON(cmd, props, def, priv->qemuCaps) < 0)
+                return -1;
+
+            break;
+
+        /* sgx epc memory will be added to -machine parameter, so skip here */
+        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+            break;
+
+        case VIR_DOMAIN_MEMORY_MODEL_NONE:
+        case VIR_DOMAIN_MEMORY_MODEL_LAST:
+            break;
+        }
     }
 
     return 0;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index b045efa203..c41a6355ba 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -7575,13 +7575,25 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon,
             return -1;
         }
 
-        /* While 'id' attribute is marked as optional in QEMU's QAPI
-         * specification, Libvirt always sets it. Thus we can fail if not
-         * present. */
-        if (!(devalias = virJSONValueObjectGetString(dimminfo, "id"))) {
-            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                           _("dimm memory info data is missing 'id'"));
-            return -1;
+        if (STREQ(type, "dimm") || STREQ(type, "nvdimm") || STREQ(type, "virtio-mem")) {
+            /* While 'id' attribute is marked as optional in QEMU's QAPI
+            * specification, Libvirt always sets it. Thus we can fail if not
+            * present. */
+            if (!(devalias = virJSONValueObjectGetString(dimminfo, "id"))) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                            _("dimm memory info data is missing 'id'"));
+                return -1;
+            }
+        } else if (STREQ(type, "sgx-epc")) {
+            if (!(devalias = virJSONValueObjectGetString(dimminfo, "memdev"))) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                            _("sgx-epc memory info data is missing 'memdev'"));
+                return -1;
+            }
+        } else {
+            virReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("%s memory device info is not handled yet"), type);
+                return -1;
         }
 
         meminfo = g_new0(qemuMonitorMemoryDeviceInfo, 1);
@@ -7625,6 +7637,21 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon,
                                _("malformed/missing size in virtio memory info"));
                 return -1;
             }
+        } else if (STREQ(type, "sgx-epc")) {
+            /* sgx-epc memory devices */
+            if (virJSONValueObjectGetNumberUlong(dimminfo, "memaddr",
+                                                 &meminfo->address) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("malformed/missing memaddr in sgx-epc memory info"));
+                return -1;
+            }
+
+            if (virJSONValueObjectGetNumberUlong(dimminfo, "size",
+                                                 &meminfo->size) < 0) {
+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                               _("malformed/missing size in sgx-epc memory info"));
+                return -1;
+            }
         } else {
             /* type not handled yet */
             continue;
diff --git a/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args b/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
new file mode 100644
index 0000000000..59c1041679
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine q35,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1 \
+-accel tcg \
+-cpu qemu64 \
+-m 214 \
+-overcommit mem-lock=off \
+-smp 2,sockets=2,cores=1,threads=1 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
+-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+-numa node,nodeid=1,cpus=1,memdev=ram-node1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \
+-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.1","addr":"0x0"}' \
+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
new file mode 100644
index 0000000000..57a0ee0724
--- /dev/null
+++ b/tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args
@@ -0,0 +1,37 @@
+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 \
+/usr/bin/qemu-system-x86_64 \
+-name guest=QEMUGuest1,debug-threads=on \
+-S \
+-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/tmp/lib/domain--1-QEMUGuest1/master-key.aes"}' \
+-machine pc-q35-6.2,usb=off,dump-guest-core=off,sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1,memory-backend=pc.ram \
+-accel tcg \
+-cpu qemu64 \
+-m 134 \
+-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":140509184}' \
+-overcommit mem-lock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
+-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
+-object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \
+-audiodev '{"id":"audio1","driver":"none"}' \
+-device virtio-balloon-pci,id=balloon0,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 05537d9e96..7a4c09b172 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3470,6 +3470,9 @@ mymain(void)
     /* HVF guests should not work on Linux with KVM */
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hvf-x86_64-q35-headless");
 
+    DO_TEST_CAPS_VER("sgx-epc", "6.2.0");
+    DO_TEST_CAPS_LATEST("sgx-epc-numa");
+
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(fakerootdir);
 
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:35:00 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:35:00 +0200
Subject: [PATCH v14 14/15] security_dac: Set DAC label on SGX /dev nodes
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <75067b41c05a8282e45866bd3254ee85b5cb682e.1658917571.git.mprivozn@redhat.com>

As advertised in previous commits, QEMU needs to access
/dev/sgx_vepc and /dev/sgx_provision files when SGX memory
backend is configured. And if it weren't for QEMU's namespaces,
we wouldn't dare to relabel them, because they are system wide
files. But if namespaces are used, then we can set label on
domain's private copies, just like we do for /dev/sev.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/security/security_dac.c | 46 ++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/security/security_dac.c b/src/security/security_dac.c
index d94995c9cf..5ca63e30f4 100644
--- a/src/security/security_dac.c
+++ b/src/security/security_dac.c
@@ -48,6 +48,8 @@ VIR_LOG_INIT("security.security_dac");
 
 #define SECURITY_DAC_NAME "dac"
 #define DEV_SEV "/dev/sev"
+#define DEV_SGX_VEPC "/dev/sgx_vepc"
+#define DEV_SGX_PROVISION "/dev/sgx_provision"
 
 typedef struct _virSecurityDACData virSecurityDACData;
 struct _virSecurityDACData {
@@ -1843,24 +1845,24 @@ virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,
                                  virDomainDef *def G_GNUC_UNUSED,
                                  virDomainMemoryDef *mem)
 {
-    int ret = -1;
-
     switch (mem->model) {
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-        ret = virSecurityDACRestoreFileLabel(mgr, mem->nvdimmPath);
+        return virSecurityDACRestoreFileLabel(mgr, mem->nvdimmPath);
+
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        /* We set label on SGX /dev nodes iff running with namespaces, so we
+         * don't need to restore anything. */
         break;
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
-        ret = 0;
         break;
     }
 
-    return ret;
+    return 0;
 }
 
 
@@ -2020,35 +2022,43 @@ virSecurityDACSetMemoryLabel(virSecurityManager *mgr,
 {
     virSecurityDACData *priv = virSecurityManagerGetPrivateData(mgr);
     virSecurityLabelDef *seclabel;
-    int ret = -1;
     uid_t user;
     gid_t group;
 
+    seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
+    if (seclabel && !seclabel->relabel)
+        return 0;
+
+    if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0)
+        return -1;
+
     switch (mem->model) {
     case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-        seclabel = virDomainDefGetSecurityLabelDef(def, SECURITY_DAC_NAME);
-        if (seclabel && !seclabel->relabel)
-            return 0;
+        return virSecurityDACSetOwnership(mgr, NULL,
+                                          mem->nvdimmPath,
+                                          user, group, true);
 
-        if (virSecurityDACGetIds(seclabel, priv, &user, &group, NULL, NULL) < 0)
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        /* Skip chowning SGX if namespaces are disabled. */
+        if (priv->mountNamespace &&
+            (virSecurityDACSetOwnership(mgr, NULL,
+                                        DEV_SGX_VEPC,
+                                        user, group, true) < 0 ||
+             virSecurityDACSetOwnership(mgr, NULL,
+                                        DEV_SGX_PROVISION,
+                                        user, group, true) < 0))
             return -1;
-
-        ret = virSecurityDACSetOwnership(mgr, NULL,
-                                         mem->nvdimmPath,
-                                         user, group, true);
         break;
 
     case VIR_DOMAIN_MEMORY_MODEL_DIMM:
     case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
     case VIR_DOMAIN_MEMORY_MODEL_LAST:
     case VIR_DOMAIN_MEMORY_MODEL_NONE:
-        ret = 0;
         break;
     }
 
-    return ret;
+    return 0;
 }
 
 
-- 
2.35.1


From mprivozn at redhat.com  Wed Jul 27 10:34:58 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Wed, 27 Jul 2022 12:34:58 +0200
Subject: [PATCH v14 12/15] qemu_cgroup: Allow SGX in devices controller
In-Reply-To: <cover.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
Message-ID: <19261f11132e69abaed62411ca8332c231d5ed30.1658917571.git.mprivozn@redhat.com>

SGX memory backend needs to access /dev/sgx_vepc (which allows
userspace to allocate "raw" EPC without an associated enclave)
and /dev/sgx_provision (which allows creating provisioning
enclaves). Allow these two devices in CGroups if a domain is
configured so.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_cgroup.c | 76 +++++++++++++++++++++++++++++++++++-------
 src/qemu/qemu_domain.h |  2 ++
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index d6f27a5a4d..6b1d9afd5f 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -120,6 +120,28 @@ qemuCgroupDenyDevicePath(virDomainObj *vm,
 }
 
 
+static int
+qemuCgroupDenyDevicesPaths(virDomainObj *vm,
+                           const char *const *paths,
+                           int perms,
+                           bool ignoreEacces)
+{
+    size_t i;
+
+    for (i = 0; paths[i] != NULL; i++) {
+        if (!virFileExists(paths[i])) {
+            VIR_DEBUG("Ignoring non-existent device %s", paths[i]);
+            continue;
+        }
+
+        if (qemuCgroupDenyDevicePath(vm, paths[i], perms, ignoreEacces) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+
+
 static int
 qemuSetupImagePathCgroup(virDomainObj *vm,
                          const char *path,
@@ -520,16 +542,31 @@ qemuSetupMemoryDevicesCgroup(virDomainObj *vm,
                              virDomainMemoryDef *mem)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM &&
-        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM)
-        return 0;
+    const char *const sgxPaths[] = { QEMU_DEV_SGX_VEPVC,
+                                     QEMU_DEV_SGX_PROVISION, NULL };
 
     if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
         return 0;
 
-    return qemuCgroupAllowDevicePath(vm, mem->nvdimmPath,
-                                     VIR_CGROUP_DEVICE_RW, false);
+    switch (mem->model) {
+    case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        if (qemuCgroupAllowDevicePath(vm, mem->nvdimmPath,
+                                      VIR_CGROUP_DEVICE_RW, false) < 0)
+            return -1;
+        break;
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (qemuCgroupAllowDevicesPaths(vm, sgxPaths, VIR_CGROUP_DEVICE_RW, false) < 0)
+            return -1;
+        break;
+    case VIR_DOMAIN_MEMORY_MODEL_NONE:
+    case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_LAST:
+        break;
+    }
+
+    return 0;
 }
 
 
@@ -538,16 +575,31 @@ qemuTeardownMemoryDevicesCgroup(virDomainObj *vm,
                                 virDomainMemoryDef *mem)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-
-    if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM &&
-        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM)
-        return 0;
+    const char *const sgxPaths[] = { QEMU_DEV_SGX_VEPVC,
+        QEMU_DEV_SGX_PROVISION, NULL };
 
     if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_DEVICES))
         return 0;
 
-    return qemuCgroupDenyDevicePath(vm, mem->nvdimmPath,
-                                    VIR_CGROUP_DEVICE_RWM, false);
+    switch (mem->model) {
+    case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
+        if (qemuCgroupDenyDevicePath(vm, mem->nvdimmPath,
+                                     VIR_CGROUP_DEVICE_RWM, false) < 0)
+            return -1;
+        break;
+    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
+        if (qemuCgroupDenyDevicesPaths(vm, sgxPaths, VIR_CGROUP_DEVICE_RW, false) < 0)
+            return -1;
+        break;
+    case VIR_DOMAIN_MEMORY_MODEL_NONE:
+    case VIR_DOMAIN_MEMORY_MODEL_DIMM:
+    case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+    case VIR_DOMAIN_MEMORY_MODEL_LAST:
+        break;
+    }
+
+    return 0;
 }
 
 
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 4680df1098..0fd5c87ae3 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -81,6 +81,8 @@ struct _qemuDomainUnpluggingDevice {
 #define QEMU_DEVPREFIX "/dev/"
 #define QEMU_DEV_VFIO "/dev/vfio/vfio"
 #define QEMU_DEV_SEV "/dev/sev"
+#define QEMU_DEV_SGX_VEPVC "/dev/sgx_vepc"
+#define QEMU_DEV_SGX_PROVISION "/dev/sgx_provision"
 #define QEMU_DEVICE_MAPPER_CONTROL_PATH "/dev/mapper/control"
 
 
-- 
2.35.1


From jdenemar at redhat.com  Wed Jul 27 13:18:39 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 27 Jul 2022 15:18:39 +0200
Subject: [libvirt PATCH] qemu: Restore original memory locking limit on
 reconnect
Message-ID: <38e144057a8f01b2d8ab2e8ec3a9d91d4e3bf7f9.1658927919.git.jdenemar@redhat.com>

Commit v8.4.0-287-gd4d3bb8130 tried to make sure the original
pre-migration memory locking limit is restored at the end of migration,
but it missed the case when libvirt daemon is restarted during
migration which needs to be aborted on reconnect.

And if this was not enough, I forgot to actually save the status XML
after setting the field in priv (in the commit mentioned above and also
in v8.4.0-291-gd375993ab3).

https://bugzilla.redhat.com/show_bug.cgi?id=2107424

Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration.c | 13 +++++++++----
 src/qemu/qemu_process.c   |  2 ++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 8e9428a5bb..e1f5e49683 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -4672,10 +4672,12 @@ qemuMigrationSrcStart(virDomainObj *vm,
     switch (spec->destType) {
     case MIGRATION_DEST_HOST:
         if (STREQ(spec->dest.host.protocol, "rdma") &&
-            virMemoryLimitIsSet(vm->def->mem.hard_limit) &&
-            qemuDomainSetMaxMemLock(vm, vm->def->mem.hard_limit << 10,
-                                    &priv->preMigrationMemlock) < 0) {
-            return -1;
+            virMemoryLimitIsSet(vm->def->mem.hard_limit)) {
+            if (qemuDomainSetMaxMemLock(vm, vm->def->mem.hard_limit << 10,
+                                        &priv->preMigrationMemlock) < 0)
+                return -1;
+            /* Store the original memory locking limit */
+            qemuDomainSaveStatus(vm);
         }
         return qemuMonitorMigrateToHost(priv->mon, migrateFlags,
                                         spec->dest.host.protocol,
@@ -4868,6 +4870,9 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
 
         if (qemuDomainSetMaxMemLock(vm, limit << 10, &priv->preMigrationMemlock) < 0)
             goto error;
+
+        /* Store the original memory locking limit */
+        qemuDomainSaveStatus(vm);
     }
 
     if (storageMigration) {
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d42333195a..137dcf5cf4 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3678,6 +3678,7 @@ qemuProcessRecoverMigration(virQEMUDriver *driver,
 {
     virDomainJobStatus migStatus = VIR_DOMAIN_JOB_STATUS_NONE;
     qemuDomainJobPrivate *jobPriv = job->privateData;
+    qemuDomainObjPrivate *priv = vm->privateData;
     virDomainState state;
     int reason;
     int rc;
@@ -3727,6 +3728,7 @@ qemuProcessRecoverMigration(virQEMUDriver *driver,
 
     qemuMigrationParamsReset(driver, vm, VIR_ASYNC_JOB_NONE,
                              jobPriv->migParams, job->apiFlags);
+    qemuDomainSetMaxMemLock(vm, 0, &priv->preMigrationMemlock);
 
     return 0;
 }
-- 
2.35.1


From pkrempa at redhat.com  Wed Jul 27 13:25:34 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 27 Jul 2022 15:25:34 +0200
Subject: [PATCH v14 02/15] qemuxml2xmltest: Test memory-hotplug-dimm-addr
In-Reply-To: <f5db919c6b5e5655bb2394747ab850a796f81f0d.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <f5db919c6b5e5655bb2394747ab850a796f81f0d.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuE8zk4eq3cqKwBd@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:48 +0200, Michal Privoznik wrote:
> After previous commit, when memory-hotplug-dimm-addr.xml file was
> fixed, we can also introduce the test case to qemuxml2xmltest.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  ...memory-hotplug-dimm-addr.x86_64-latest.xml | 63 +++++++++++++++++++
>  tests/qemuxml2xmltest.c                       |  1 +
>  2 files changed, 64 insertions(+)
>  create mode 100644 tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Wed Jul 27 13:25:07 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 27 Jul 2022 15:25:07 +0200
Subject: [PATCH v14 01/15] qemuxml2argvtest: Switch
 memory-hotplug-dimm-addr to latest caps
In-Reply-To: <cd7056acc0af8d2dc9ebd7c54c8b7dc65ce9170b.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <cd7056acc0af8d2dc9ebd7c54c8b7dc65ce9170b.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuE8s3ZV5Wfru/mE@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:47 +0200, Michal Privoznik wrote:
> So far, we are testing memory-hotplug-dimm-addr against a set of
> explicitly listed capabilities. While this works, lets switch it
> to DO_TEST_CAPS_LATEST() so that the latest capabilities are
> used. This in turn means, we have to update the <emulator/>
> because the latest capabilities don't contain caps for
> qemu-system-i386.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  ...mory-hotplug-dimm-addr.x86_64-latest.args} | 30 +++++++++++--------
>  .../memory-hotplug-dimm-addr.xml              |  2 +-
>  tests/qemuxml2argvtest.c                      |  3 +-
>  3 files changed, 19 insertions(+), 16 deletions(-)
>  rename tests/qemuxml2argvdata/{memory-hotplug-dimm-addr.args => memory-hotplug-dimm-addr.x86_64-latest.args} (32%)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Wed Jul 27 13:32:36 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 27 Jul 2022 15:32:36 +0200
Subject: [PATCH v14 03/15] conf: Validate virDomainMemoryDef::targetNode
In-Reply-To: <ee85278de9c0e6545271374c3ff472f0b53283bd.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <ee85278de9c0e6545271374c3ff472f0b53283bd.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuE+dM5CCF74ZuBD@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:49 +0200, Michal Privoznik wrote:
> Almost all of memory models we currently support allow setting
> virDomainMemoryDef::targetNode so that the memory module is
> associated with given guest NUMA node. And we do have a check
> whether the requested node is within bounds, but it's executed
> only when building QEMU's cmd line. Move it into validation
> phase.

The commit message should also point out, that while this commit is
moving the validation to a place that does _not_ validate all the
possible code paths, it's okay, because only the explicit memory device
has user-configurable target node which could break the assumption.

> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/conf/domain_validate.c                    | 13 ++++++
>  src/qemu/qemu_command.c                       |  9 ----
>  .../memory-hotplug-invalid-targetnode.err     |  1 +
>  .../memory-hotplug-invalid-targetnode.xml     | 42 +++++++++++++++++++
>  tests/qemuxml2argvtest.c                      |  1 +
>  5 files changed, 57 insertions(+), 9 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.err
>  create mode 100644 tests/qemuxml2argvdata/memory-hotplug-invalid-targetnode.xml

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Wed Jul 27 13:36:41 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 27 Jul 2022 15:36:41 +0200
Subject: [PATCH v14 04/15] qemu_command: Separate domain features
 building into a helper
In-Reply-To: <7ef596aa6e1ee187eb7a2113557d3e2fb3eb53ef.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <7ef596aa6e1ee187eb7a2113557d3e2fb3eb53ef.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuE/aSD39sS71UKC@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:50 +0200, Michal Privoznik wrote:
> The qemuBuildMachineCommandLine() function is needlessly long.
> Separate out parts that generate arguments based on
> domainDef->features[] into
> qemuAppendDomainFeaturesMachineParam(). Unfortunately, expected
> outputs for some qemuxml2argvdata cases needed to be updated
> because the order in which features are generated is changed. But
> there's no functional change.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_command.c                       | 154 ++++++++++--------
>  ...-auto-efi-enrolled-keys.x86_64-latest.args |   2 +-
>  ...-auto-efi-loader-secure.x86_64-latest.args |   2 +-
>  ...firmware-auto-efi-nvram.x86_64-latest.args |   2 +-
>  ...rmware-auto-efi-secboot.x86_64-latest.args |   2 +-
>  .../firmware-auto-efi.x86_64-latest.args      |   2 +-
>  .../firmware-manual-efi-secure.args           |   2 +-
>  .../machine-smm-off.x86_64-latest.args        |   2 +-
>  .../machine-smm-on.x86_64-latest.args         |   2 +-
>  .../qemuxml2argvdata/machine-vmport-opt.args  |   2 +-
>  .../q35-virt-manager-basic.args               |   2 +-
>  .../tseg-explicit-size.x86_64-latest.args     |   2 +-
>  12 files changed, 95 insertions(+), 81 deletions(-)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From jdenemar at redhat.com  Wed Jul 27 13:43:56 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Wed, 27 Jul 2022 15:43:56 +0200
Subject: [libvirt PATCH for 8.6.0] qemu: Properly release job in
 qemuDomainSaveInternal
Message-ID: <cd8e267f213725efe76e48506359f796a0d85a20.1658929436.git.jdenemar@redhat.com>

The function would fail to release the job in case
qemuMigrationSrcIsAllowed failed.

Fixes v8.5.0-157-g69e0e33873

Signed-off-by: Jiri Denemark <jdenemar at 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 9013e6fb8d..019ec4a035 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -2656,7 +2656,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver,
         goto cleanup;
 
     if (!qemuMigrationSrcIsAllowed(driver, vm, false, VIR_ASYNC_JOB_SAVE, 0))
-        goto cleanup;
+        goto endjob;
 
     if (!virDomainObjIsActive(vm)) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-- 
2.35.1


From pkrempa at redhat.com  Wed Jul 27 13:38:26 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Wed, 27 Jul 2022 15:38:26 +0200
Subject: [PATCH v14 05/15] qemu_command: Separate domain memory building
 into a helper
In-Reply-To: <5f5c15c2aa094b1e15384d286b690cf0e264523b.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <5f5c15c2aa094b1e15384d286b690cf0e264523b.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuE/0r/bBaE1C2x4@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:51 +0200, Michal Privoznik wrote:
> The qemuBuildMachineCommandLine() function is needlessly long.
> Separate out parts that generate memory related arguments into
> qemuAppendDomainMemoryMachineParams(). Unfortunately, expected
> outputs for some qemuxml2argvdata cases needed to be updated
> because the order in which arguments are generated is changed.
> But there's no functional change.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From phrdina at redhat.com  Wed Jul 27 14:02:04 2022
From: phrdina at redhat.com (Pavel Hrdina)
Date: Wed, 27 Jul 2022 16:02:04 +0200
Subject: [libvirt PATCH for 8.6.0] qemu: Properly release job in
 qemuDomainSaveInternal
In-Reply-To: <cd8e267f213725efe76e48506359f796a0d85a20.1658929436.git.jdenemar@redhat.com>
References: <cd8e267f213725efe76e48506359f796a0d85a20.1658929436.git.jdenemar@redhat.com>
Message-ID: <YuFFXBGH1j6a8T2U@antique-laptop>

On Wed, Jul 27, 2022 at 03:43:56PM +0200, Jiri Denemark wrote:
> The function would fail to release the job in case
> qemuMigrationSrcIsAllowed failed.
> 
> Fixes v8.5.0-157-g69e0e33873
> 
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  src/qemu/qemu_driver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Pavel Hrdina <phrdina at redhat.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220727/0857d553/attachment.sig>

From laine at redhat.com  Wed Jul 27 16:28:23 2022
From: laine at redhat.com (Laine Stump)
Date: Wed, 27 Jul 2022 12:28:23 -0400
Subject: [PATCH] qemu: don't call qemuMigrationSrcIsAllowedHostdev() from
 qemuMigrationDstPrepareFresh()
Message-ID: <20220727162823.277305-1-laine@redhat.com>

This call to qemuMigrationSrcIsAllowedHostdev() (which does a
hardcoded fail of the migration if there is any PCI or mdev hostdev
device in the domain) while doing the destination side of migration
prep was found once the call to that same function was removed from
the source side migration prep (commit 25883cd5).

According to jdenemar, for the V2 migration protocol, prep of the
destination is the first step, so this *was* the proper place to do
the check, but for V3 migration this is in a way redundant (since we
will have already done the check on the source side (updated by
25883cd5 to query QEMU rather than do a hardcoded fail)).

Of course it's possible that the source could support migration of a
particular VFIO device, but the destination doesn't. But the current
check on the destination side is worthless even in that case, since it
is just *always* failing rather than querying QEMU; and QEMU can't be
queried at the point where the destination check is happening, since
it isn't yet running.

Anyway QEMU should complain when it's started if it's going to fail,
so removing this check should just move the failure to happen a bit
later. So the best solution to this problem is to simply remove the
hardcoded check/fail from qemuMigrationDstPrepareFresh() and rely on
QEMU to fail if it needs to.

Fixes: 25883cd5f0b188f2417f294b7d219a77b219f7c2
Signed-off-by: Laine Stump <laine at redhat.com>
---
 src/qemu/qemu_migration.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 20dc91f1ce..85b6b12f92 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3379,9 +3379,6 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
                       QEMU_MIGRATION_COOKIE_CAPS;
     }
 
-    if (!qemuMigrationSrcIsAllowedHostdev(*def))
-        goto cleanup;
-
     /* Let migration hook filter domain XML */
     if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) {
         g_autofree char *xml = NULL;
-- 
2.35.3


From pkrempa at redhat.com  Thu Jul 28 08:01:47 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 10:01:47 +0200
Subject: [PATCH v14 06/15] qemu_cgroup: Don't ignore ENOENT in
 qemuCgroupAllowDevicesPaths()
In-Reply-To: <c55f4578656ec83753f988a82796c7ba64fae239.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <c55f4578656ec83753f988a82796c7ba64fae239.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuJCa1lj7AU68PMq@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:52 +0200, Michal Privoznik wrote:
> There's no need to skip over ENOENT error in
> qemuCgroupAllowDevicesPaths(). The path must exists when
> qemuCgroupAllowDevicePath() is called because of virFileExists()
> check done right above.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_cgroup.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Thu Jul 28 08:04:23 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 10:04:23 +0200
Subject: [PATCH v14 07/15] domain_capabilities: Define SGX capabilities
 structs
In-Reply-To: <0c3261492013cabeaa6652755c3c00ea05934cc8.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <0c3261492013cabeaa6652755c3c00ea05934cc8.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuJDB6v4m4Q079yn@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:53 +0200, Michal Privoznik wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/conf/domain_capabilities.c | 11 +++++++++++
>  src/conf/domain_capabilities.h | 22 ++++++++++++++++++++++
>  src/libvirt_private.syms       |  1 +
>  3 files changed, 34 insertions(+)

[...]

> diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
> index a526969cda..e4654a65cd 100644
> --- a/src/conf/domain_capabilities.h
> +++ b/src/conf/domain_capabilities.h
> @@ -193,6 +193,22 @@ struct _virSEVCapability {
>      unsigned int max_es_guests;
>  };
>  
> +typedef struct _virSection virSection;

This name feels a bit too generic and not much reusable. On the other
hand changing it feels pointless.

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Thu Jul 28 08:15:39 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 10:15:39 +0200
Subject: [PATCH v14 08/15] qemu: Get SGX capabilities form QMP
In-Reply-To: <42c52bebf36031a405c356167603aa2fa310d2a9.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <42c52bebf36031a405c356167603aa2fa310d2a9.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuJFqzsAlPvdvC0J@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:54 +0200, Michal Privoznik wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> Generate the QMP command for query-sgx-capabilities and the command
> return SGX capabilities from QMP.
> 
> {"execute":"query-sgx-capabilities"}
> 
> the right reply:
>   {"return":
>     {
>       "sgx": true,
>       "section-size": 197132288,
>       "flc": true
>     }
>   }
> 
> the error reply:
>   {"error":
>     {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
>   }
> 
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_monitor.c      |  10 ++++
>  src/qemu/qemu_monitor.h      |   3 +
>  src/qemu/qemu_monitor_json.c | 107 +++++++++++++++++++++++++++++++++++
>  src/qemu/qemu_monitor_json.h |   4 ++
>  4 files changed, 124 insertions(+)

[...]

> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index 941596563a..b045efa203 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -6395,6 +6395,113 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
>      return 1;
>  }
>  
> +
> +/**
> + * qemuMonitorJSONGetSGXCapabilities:
> + * @mon: qemu monitor object
> + * @capabilities: pointer to pointer to a SGX capability structure to be filled
> + *
> + * This function queries and fills in INTEL's SGX platform-specific data.
> + * Note that from QEMU's POV both -object sgx-epc and query-sgx-capabilities
> + * can be present even if SGX is not available, which basically leaves us with
> + * checking for JSON "GenericError" in order to differentiate between compiled-in
> + * support and actual SGX support on the platform.
> + *
> + * Returns: -1 on error,
> + *           0 if SGX is not supported, and
> + *           1 if SGX is supported on the platform.
> + */
> +int
> +qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
> +                                  virSGXCapability **capabilities)
> +{
> +    g_autoptr(virJSONValue) cmd = NULL;
> +    g_autoptr(virJSONValue) reply = NULL;
> +    g_autoptr(virSGXCapability) capability = NULL;
> +    virJSONValue *sections = NULL;
> +    virJSONValue *caps;
> +    bool flc = false;
> +    bool sgx1 = false;
> +    bool sgx2 = false;

These temporary booleans feel a bit redundant ...

> +    unsigned long long section_size = 0;
> +    unsigned long long size;
> +    size_t i;
> +
> +    *capabilities = NULL;
> +    capability = g_new0(virSGXCapability, 1);
> +
> +    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities", NULL)))
> +        return -1;
> +
> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> +        return -1;
> +
> +    /* QEMU has only compiled-in support of SGX */
> +    if (qemuMonitorJSONHasError(reply, "GenericError"))
> +        return 0;
> +
> +    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
> +        return -1;
> +
> +    caps = virJSONValueObjectGetObject(reply, "return");
> +
> +    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'flc' field"));
> +        return -1;
> +    }
> +    capability->flc = flc;

Because you assign the value directly back to the struct. Passing the
pointer to the field in the struct directly to
virJSONValueObjectGetBoolean avoids the need.

> +
> +    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
> +        return -1;
> +    }
> +    capability->sgx1 = sgx1;
> +
> +    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
> +        return -1;
> +    }
> +    capability->sgx2 = sgx2;
> +
> +    if (virJSONValueObjectGetNumberUlong(caps, "section-size", &section_size) < 0) {
> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                       _("query-sgx-capabilities reply was missing 'section-size' field"));
> +        return -1;
> +    }
> +    capability->section_size = section_size / 1024;

The 'section-size' field is marked as deprecated in the QMP schema. Thus
we must not report error if it vanishes.

Is there any reason to extract it in the first place?

If yes, the code must be fixed to handle the possibility properly.

> +
> +    if ((sections = virJSONValueObjectGetArray(caps, "sections"))) {
> +        /* Got the section, the QEMU version is above 7.0.0 */
> +        capability->nsections = virJSONValueArraySize(sections);
> +        capability->sections = g_new0(virSection, capability->nsections);
> +
> +        for (i = 0; i < capability->nsections; i++) {
> +            virJSONValue *elem = virJSONValueArrayGet(sections, i);
> +
> +            if (virJSONValueObjectGetNumberUlong(elem, "size", &size) < 0) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                               _("query-sgx-capabilities reply was missing 'size' field"));
> +                return -1;
> +            }
> +            capability->sections[i].size = size / 1024;
> +
> +            if (virJSONValueObjectGetNumberInt(elem, "node",
> +                                               &capability->sections[i].node) < 0) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                               _("query-sgx-capabilities reply was missing 'node' field"));
> +                return -1;
> +            }
> +        }
> +    }
> +
> +    *capabilities = g_steal_pointer(&capability);
> +    return 1;
> +}
> +
> +
>  static virJSONValue *
>  qemuMonitorJSONBuildInetSocketAddress(const char *host,
>                                        const char *port)

From berrange at redhat.com  Thu Jul 28 08:35:33 2022
From: berrange at redhat.com (Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?=)
Date: Thu, 28 Jul 2022 09:35:33 +0100
Subject: [PATCH v14 07/15] domain_capabilities: Define SGX capabilities
 structs
In-Reply-To: <YuJDB6v4m4Q079yn@angien.pipo.sk>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <0c3261492013cabeaa6652755c3c00ea05934cc8.1658917570.git.mprivozn@redhat.com>
 <YuJDB6v4m4Q079yn@angien.pipo.sk>
Message-ID: <YuJKVYjFa49Q2seq@redhat.com>

On Thu, Jul 28, 2022 at 10:04:23AM +0200, Peter Krempa wrote:
> On Wed, Jul 27, 2022 at 12:34:53 +0200, Michal Privoznik wrote:
> > From: Haibin Huang <haibin.huang at intel.com>
> > 
> > Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> > Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> > ---
> >  src/conf/domain_capabilities.c | 11 +++++++++++
> >  src/conf/domain_capabilities.h | 22 ++++++++++++++++++++++
> >  src/libvirt_private.syms       |  1 +
> >  3 files changed, 34 insertions(+)
> 
> [...]
> 
> > diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
> > index a526969cda..e4654a65cd 100644
> > --- a/src/conf/domain_capabilities.h
> > +++ b/src/conf/domain_capabilities.h
> > @@ -193,6 +193,22 @@ struct _virSEVCapability {
> >      unsigned int max_es_guests;
> >  };
> >  
> > +typedef struct _virSection virSection;
> 
> This name feels a bit too generic and not much reusable. On the other
> hand changing it feels pointless.

Clearly it should be   virSGXSection 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

From haibin.huang at intel.com  Thu Jul 28 08:36:44 2022
From: haibin.huang at intel.com (Huang, Haibin)
Date: Thu, 28 Jul 2022 08:36:44 +0000
Subject: [PATCH v14 07/15] domain_capabilities: Define SGX capabilities
 structs
In-Reply-To: <YuJKVYjFa49Q2seq@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <0c3261492013cabeaa6652755c3c00ea05934cc8.1658917570.git.mprivozn@redhat.com>
 <YuJDB6v4m4Q079yn@angien.pipo.sk> <YuJKVYjFa49Q2seq@redhat.com>
Message-ID: <MW4PR11MB59097A7CD5AE02282ABD975391969@MW4PR11MB5909.namprd11.prod.outlook.com>



> -----Original Message-----
> From: Daniel P. Berrang? <berrange at redhat.com>
> Sent: Thursday, July 28, 2022 4:36 PM
> To: Peter Krempa <pkrempa at redhat.com>
> Cc: Michal Privoznik <mprivozn at redhat.com>; libvir-list at redhat.com; Yang,
> Lin A <lin.a.yang at intel.com>; Ding, Jian-feng <jian-feng.ding at intel.com>;
> Huang, Haibin <haibin.huang at intel.com>
> Subject: Re: [PATCH v14 07/15] domain_capabilities: Define SGX capabilities
> structs
> 
> On Thu, Jul 28, 2022 at 10:04:23AM +0200, Peter Krempa wrote:
> > On Wed, Jul 27, 2022 at 12:34:53 +0200, Michal Privoznik wrote:
> > > From: Haibin Huang <haibin.huang at intel.com>
> > >
> > > Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> > > Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> > > ---
> > >  src/conf/domain_capabilities.c | 11 +++++++++++
> > > src/conf/domain_capabilities.h | 22 ++++++++++++++++++++++
> > >  src/libvirt_private.syms       |  1 +
> > >  3 files changed, 34 insertions(+)
> >
> > [...]
> >
> > > diff --git a/src/conf/domain_capabilities.h
> > > b/src/conf/domain_capabilities.h index a526969cda..e4654a65cd 100644
> > > --- a/src/conf/domain_capabilities.h
> > > +++ b/src/conf/domain_capabilities.h
> > > @@ -193,6 +193,22 @@ struct _virSEVCapability {
> > >      unsigned int max_es_guests;
> > >  };
> > >
> > > +typedef struct _virSection virSection;
> >
> > This name feels a bit too generic and not much reusable. On the other
> > hand changing it feels pointless.
> 
> Clearly it should be   virSGXSection
[Haibin] good idea, I will modify it.
> 
> With regards,
> Daniel
> --
> |: https://berrange.com      -o-
> https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-
> https://www.instagram.com/dberrange :|


From pkrempa at redhat.com  Thu Jul 28 08:53:23 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 10:53:23 +0200
Subject: [PATCH v14 09/15] Convert QMP capabilities to domain capabilities
In-Reply-To: <a003713dba87682cb1c2700a2e3de1174940c936.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <a003713dba87682cb1c2700a2e3de1174940c936.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuJOg8uc9MrVZTlj@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:55 +0200, Michal Privoznik wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> the QMP capabilities:
>   {"return":
>     {
>       "sgx": true,
>       "section-size": 1024,
>       "flc": true
>     }
>   }
> 
> the domain capabilities:
>   <sgx>
>     <flc>yes</flc>
>     <epc_size>1</epc_size>
>   </sgx>
> 
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_capabilities.c                  | 206 ++++++++++++++++++
>  src/qemu/qemu_capabilities.h                  |   6 +
>  .../caps_6.2.0.x86_64.replies                 |  24 +-
>  .../caps_6.2.0.x86_64.xml                     |   7 +
>  .../caps_7.0.0.x86_64.replies                 |  34 ++-
>  .../caps_7.0.0.x86_64.xml                     |  11 +
>  .../caps_7.1.0.x86_64.replies                 |  34 ++-
>  .../caps_7.1.0.x86_64.xml                     |  11 +

Preferrably do not mix addition to capability probing with other stuff
such as the capabiltiies XML formatter/parser next time.

You can always add the formatter/parser first and then do the minimum
required to add capability flag and probe it.

>  8 files changed, 321 insertions(+), 12 deletions(-)

[...]

> @@ -1973,6 +1979,36 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst,
>  }
>  
>  
> +static int
> +virQEMUCapsSGXInfoCopy(virSGXCapability **dst,
> +                       virSGXCapability *src)
> +{
> +    g_autoptr(virSGXCapability) tmp = NULL;
> +
> +    if (!src) {
> +        *dst = NULL;
> +        return 0;
> +    }
> +
> +    tmp = g_new0(virSGXCapability, 1);
> +
> +    tmp->flc = src->flc;
> +    tmp->sgx1 = src->sgx1;
> +    tmp->sgx2 = src->sgx2;
> +    tmp->section_size = src->section_size;
> +
> +    if (src->nsections > 0) {
> +        tmp->sections = g_new0(virSection, src->nsections);
> +        memcpy(tmp->sections, src->sections,
> +               src->nsections * sizeof(*tmp->sections));
> +        tmp->nsections = src->nsections;
> +    }
> +
> +    *dst = g_steal_pointer(&tmp);
> +    return 0;
> +}
> +
> +
>  static void
>  virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
>                                   virQEMUCapsAccel *src)
> @@ -2054,6 +2090,12 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
>                                 qemuCaps->sevCapabilities) < 0)
>          return NULL;
>  
> +
> +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) &&

This doesn't seem to be needed ...

> +        virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities,

as this doesn't copy anything if 'src' is NULL.

> +                               qemuCaps->sgxCapabilities) < 0)
> +        return NULL;
> +
>      return g_steal_pointer(&ret);
>  }
>  

[...]

> @@ -4221,6 +4296,98 @@ virQEMUCapsParseSEVInfo(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
>  }
>  
>  
> +static int
> +virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
> +                        xmlXPathContextPtr ctxt)
> +{
> +    g_autoptr(virSGXCapability) sgx = NULL;
> +    xmlNodePtr sections = NULL;
> +    g_autofree char *flc = NULL;
> +    g_autofree char *sgx1 = NULL;
> +    g_autofree char *sgx2 = NULL;
> +
> +    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
> +        return 0;

Note that this flag

> +
> +    if (virXPathBoolean("boolean(./sgx)", ctxt) == 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing SGX platform data in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    sgx = g_new0(virSGXCapability, 1);
> +
> +    if ((!(flc = virXPathString("string(./sgx/flc)", ctxt))) ||
> +        virStringParseYesNo(flc, &sgx->flc) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or invalid SGX platform flc in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if ((!(sgx1 = virXPathString("string(./sgx/sgx1)", ctxt))) ||
> +        virStringParseYesNo(sgx1, &sgx->sgx1) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or invalid SGX platform sgx1 in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if ((!(sgx2 = virXPathString("string(./sgx/sgx2)", ctxt))) ||
> +        virStringParseYesNo(sgx2, &sgx->sgx2) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or invalid SGX platform sgx2 in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if (virXPathULongLong("string(./sgx/section_size)", ctxt,
> +                          &sgx->section_size) < 0) {
> +        virReportError(VIR_ERR_XML_ERROR, "%s",
> +                       _("missing or malformed SGX platform section_size in QEMU capabilities cache"));
> +        return -1;
> +    }
> +
> +    if ((sections = virXPathNode("./sgx/sections", ctxt))) {
> +        g_autofree xmlNodePtr *sectionNodes = NULL;
> +        int nsections = 0;
> +        size_t i;
> +        VIR_XPATH_NODE_AUTORESTORE(ctxt);
> +
> +        ctxt->node = sections;
> +        nsections = virXPathNodeSet("./section", ctxt, &sectionNodes);
> +
> +        if (nsections < 0) {
> +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                           _("failed to parse SGX sections in QEMU capabilities cache"));
> +            return -1;
> +        }
> +
> +        sgx->nsections = nsections;
> +        sgx->sections = g_new0(virSection, nsections);
> +
> +        for (i = 0; i < nsections; i++) {
> +            g_autofree char * strNode = NULL;
> +            g_autofree char * strSize = NULL;
> +
> +            if (!(strNode = virXMLPropString(sectionNodes[i], "node")) ||
> +                virStrToLong_i(strNode, NULL, 10, &sgx->sections[i].node) < 0) {

We have helpers such as virXMLPropUInt and similar, removing the need
for temporary strings and explicit parsing of the numbers.

I'd prefer if you use them instead of this open coding .... in the whole
function.

> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                               _("missing node name in QEMU capabilities cache"));
> +                return -1;
> +            }
> +
> +            if (!(strSize = virXMLPropString(sectionNodes[i], "size")) ||
> +                virStrToLong_ull(strSize, NULL, 10, &(sgx->sections[i].size)) < 0) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                               _("missing size name in QEMU capabilities cache"));
> +                return -1;
> +            }
> +        }
> +    }
> +
> +    qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
> +    return 0;
> +}
> +
> +

[...]

> +static void
> +virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
> +                         virBuffer *buf)
> +{
> +    virSGXCapability *sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
> +
> +    virBufferAddLit(buf, "<sgx supported='yes'>\n");
> +    virBufferAdjustIndent(buf, 2);
> +    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
> +    virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", sgx->sgx1 ? "yes" : "no");
> +    virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", sgx->sgx2 ? "yes" : "no");
> +    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);

If the 'section_size' vanishes from qemu, will this field need to be
removed?

> +
> +    if (sgx->nsections > 0) {
> +        size_t i;
> +        virBufferAddLit(buf, "<sections>\n");
> +
> +        for (i = 0; i < sgx->nsections; i++) {
> +            virBufferAdjustIndent(buf, 2);
> +            virBufferAsprintf(buf, "<section node='%u' ", sgx->sections[i].node);
> +            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->sections[i].size);
> +            virBufferAdjustIndent(buf, -2);
> +        }
> +        virBufferAddLit(buf, "</sections>\n");
> +    }
> +
> +    virBufferAdjustIndent(buf, -2);
> +    virBufferAddLit(buf, "</sgx>\n");
> +}
> +
> +
>  char *
>  virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
>  {
> @@ -4789,6 +4990,9 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
>      if (qemuCaps->sevCapabilities)
>          virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
>  
> +    if (qemuCaps->sgxCapabilities)

As example for my comment about copying the caps, here you don't check
the capability.

> +        virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
> +
>      if (qemuCaps->kvmSupportsNesting)
>          virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
>  

[...]

> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
> index d893d67ea8..c221b9e034 100644
> --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
> +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
> @@ -34006,6 +34006,32 @@
>    }
>  }
>  
> +{
> +  "execute": "query-sgx-capabilities",
> +  "id": "libvirt-51"
> +}
> +
> +{
> +  "return": {
> +    "sgx": true,
> +    "flc": false,
> +    "sgx1": true,
> +    "sgx2": false,
> +    "section-size": 2048,
> +    "sections": [
> +      {
> +        "node": 0,
> +        "size": 1024
> +      },
> +      {
> +        "node": 1,
> +        "size": 1024
> +      }

Next time I'll be re-generating the capabilities this will get
overwritten by:

+  "id": "libvirt-51",
+  "error": {
+    "class": "GenericError",
+    "desc": "SGX is not enabled in KVM"
+  }


as my box does not support it. I'd strongly prefer to use this syntax to
avoid changes in my caps bump patch.

From jdenemar at redhat.com  Thu Jul 28 10:09:34 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Thu, 28 Jul 2022 12:09:34 +0200
Subject: [PATCH] qemu: don't call qemuMigrationSrcIsAllowedHostdev() from
 qemuMigrationDstPrepareFresh()
In-Reply-To: <20220727162823.277305-1-laine@redhat.com>
References: <20220727162823.277305-1-laine@redhat.com>
Message-ID: <YuJgXu+q89lrBqTr@orkuz.int.mamuti.net>

On Wed, Jul 27, 2022 at 12:28:23 -0400, Laine Stump wrote:
> This call to qemuMigrationSrcIsAllowedHostdev() (which does a
> hardcoded fail of the migration if there is any PCI or mdev hostdev
> device in the domain) while doing the destination side of migration
> prep was found once the call to that same function was removed from
> the source side migration prep (commit 25883cd5).
> 
> According to jdenemar, for the V2 migration protocol, prep of the
> destination is the first step, so this *was* the proper place to do
> the check, but for V3 migration this is in a way redundant (since we
> will have already done the check on the source side (updated by
> 25883cd5 to query QEMU rather than do a hardcoded fail)).
> 
> Of course it's possible that the source could support migration of a
> particular VFIO device, but the destination doesn't. But the current
> check on the destination side is worthless even in that case, since it
> is just *always* failing rather than querying QEMU; and QEMU can't be
> queried at the point where the destination check is happening, since
> it isn't yet running.
> 
> Anyway QEMU should complain when it's started if it's going to fail,
> so removing this check should just move the failure to happen a bit
> later. So the best solution to this problem is to simply remove the
> hardcoded check/fail from qemuMigrationDstPrepareFresh() and rely on
> QEMU to fail if it needs to.
> 
> Fixes: 25883cd5f0b188f2417f294b7d219a77b219f7c2
> Signed-off-by: Laine Stump <laine at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 20dc91f1ce..85b6b12f92 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -3379,9 +3379,6 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
>                        QEMU_MIGRATION_COOKIE_CAPS;
>      }
>  
> -    if (!qemuMigrationSrcIsAllowedHostdev(*def))
> -        goto cleanup;
> -
>      /* Let migration hook filter domain XML */
>      if (virHookPresent(VIR_HOOK_DRIVER_QEMU)) {
>          g_autofree char *xml = NULL;

Reviewed-by: Jiri Denemark <jdenemar at redhat.com>

And safe for freeze.

From mprivozn at redhat.com  Thu Jul 28 10:43:25 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 28 Jul 2022 12:43:25 +0200
Subject: [libvirt PATCH] qemu: Restore original memory locking limit on
 reconnect
In-Reply-To: <38e144057a8f01b2d8ab2e8ec3a9d91d4e3bf7f9.1658927919.git.jdenemar@redhat.com>
References: <38e144057a8f01b2d8ab2e8ec3a9d91d4e3bf7f9.1658927919.git.jdenemar@redhat.com>
Message-ID: <59413025-c710-6160-3531-9987f5c53dc3@redhat.com>

On 7/27/22 15:18, Jiri Denemark wrote:
> Commit v8.4.0-287-gd4d3bb8130 tried to make sure the original
> pre-migration memory locking limit is restored at the end of migration,
> but it missed the case when libvirt daemon is restarted during
> migration which needs to be aborted on reconnect.
> 
> And if this was not enough, I forgot to actually save the status XML
> after setting the field in priv (in the commit mentioned above and also
> in v8.4.0-291-gd375993ab3).
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=2107424
> 
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 13 +++++++++----
>  src/qemu/qemu_process.c   |  2 ++
>  2 files changed, 11 insertions(+), 4 deletions(-)


Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

and safe for freeze, since it's a bugfix :-)

Michal


From pkrempa at redhat.com  Thu Jul 28 11:06:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 13:06:42 +0200
Subject: [PATCH v14 10/15] conf: expose SGX feature in domain capabilities
In-Reply-To: <be853acd968cc63db31582aaf93beb03c7ed9432.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <be853acd968cc63db31582aaf93beb03c7ed9432.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuJtwuwWnYdZcjGb@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:56 +0200, Michal Privoznik wrote:
> From: Haibin Huang <haibin.huang at intel.com>
> 
> Extend hypervisor capabilities to include sgx feature. When available,
> the hypervisor supports launching an VM with SGX on Intel platfrom.
> The SGX feature tag privides additional details like section size and
> sgx1 or sgx2.
> 
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---

[...]

> 
> diff --git a/docs/formatdomaincaps.rst b/docs/formatdomaincaps.rst
> index 70f46b972a..bca5389931 100644
> --- a/docs/formatdomaincaps.rst
> +++ b/docs/formatdomaincaps.rst
> @@ -554,6 +554,16 @@ capabilities. All features occur as children of the main ``features`` element.
>           <cbitpos>47</cbitpos>
>           <reduced-phys-bits>1</reduced-phys-bits>
>         </sev>
> +       <sgx supported='yes'>
> +         <flc>no</flc>
> +         <sgx1>yes</sgx1>
> +         <sgx2>no</sgx2>
> +         <section_size>2</section_size>

This element has "unit='KiB'" in the output data in the tests.

> +         <sections>
> +           <section node='0' size='1'/>
> +           <section node='1' size='1'/>

And this one should get a unit too, since the above has it.

> +         </sections>
> +       </sgx>
>       </features>
>     </domainCapabilities>
>  
> @@ -633,3 +643,33 @@ in domain XML <formatdomain.html#launch-security>`__
>  ``maxESGuests``
>     The maximum number of SEV-ES guests that can be launched on the host. This
>     value may be configurable in the firmware for some hosts.
> +
> +SGX capabilities
> +^^^^^^^^^^^^^^^^
> +
> +Intel Software Guard Extensions (Intel SGX) capabilities are exposed under the
> +``sgx`` element.
> +
> +Intel SGX helps protect data in use via unique application isolation technology.
> +Protect selected code and data from modification using hardened enclaves with
> +Intel SGX.
> +
> +For more details on the SGX feature, please follow resources in the SGX developer's
> +document store. In order to use SGX with libvirt have a look at formatdomain.rst
> +Memory devices.

This should be a real RST link to the document/section you are refering
to.

> +
> +``flc``
> +   FLC (Flexible Launch Control), not strictly part of SGX2, but was not part of
> +   original SGX hardware either.
> +
> +``sgx1``
> +   the sgx version 1.
> +
> +``sgx2``
> +   The sgx version 2.
> +
> +``section_size``
> +   The size of the SGX enclave page cache (called EPC).
> +
> +``sections``
> +   The sections of the SGX enclave page cache (called EPC).
> diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
> index 1d3bba3019..ef41612494 100644
> --- a/src/conf/domain_capabilities.c
> +++ b/src/conf/domain_capabilities.c

[...]


> @@ -621,6 +622,39 @@ virDomainCapsFeatureSEVFormat(virBuffer *buf,
>      virBufferAddLit(buf, "</sev>\n");
>  }
>  
> +static void
> +virDomainCapsFeatureSGXFormat(virBuffer *buf,
> +                              const virSGXCapability *sgx)
> +{
> +    if (!sgx) {
> +        virBufferAddLit(buf, "<sgx supported='no'/>\n");
> +        return;
> +    }
> +
> +    virBufferAddLit(buf, "<sgx supported='yes'>\n");
> +    virBufferAdjustIndent(buf, 2);
> +    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
> +    virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", sgx->sgx1 ? "yes" : "no");
> +    virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", sgx->sgx2 ? "yes" : "no");
> +    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
> +
> +    if (sgx->nsections > 0) {
> +        size_t i;
> +
> +        virBufferAddLit(buf, "<sections>\n");
> +
> +        for (i = 0; i < sgx->nsections; i++) {
> +            virBufferAdjustIndent(buf, 2);
> +            virBufferAsprintf(buf, "<section node='%d' ", sgx->sections[i].node);
> +            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->sections[i].size);

I think you want to ad a unit field too here.

> +            virBufferAdjustIndent(buf, -2);
> +        }
> +        virBufferAddLit(buf, "</sections>\n");
> +    }
> +
> +    virBufferAdjustIndent(buf, -2);
> +    virBufferAddLit(buf, "</sgx>\n");

This looks almost identical to the formatter for the qemu capability
cache. Would it make sense to factor it out and reuse it instead of
reimplementing?

[...]

> diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
> index 4e6ff06125..5eff1a0ff9 100644
> --- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
> +++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
> @@ -228,5 +228,15 @@
>      <backingStoreInput supported='yes'/>
>      <backup supported='yes'/>
>      <sev supported='no'/>
> +    <sgx supported='yes'>
> +      <flc>no</flc>
> +      <sgx1>yes</sgx1>
> +      <sgx2>no</sgx2>
> +      <section_size unit='KiB'>2</section_size>
> +      <sections>
> +        <section node='0' size='1'/>
> +        <section node='1' size='1'/>

This looks weird without unit.

> +      </sections>
> +    </sgx>
>    </features>
>  </domainCapabilities>

From pkrempa at redhat.com  Thu Jul 28 12:41:01 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 14:41:01 +0200
Subject: [PATCH v14 11/15] conf: Introduce SGX EPC element into device
 memory xml
In-Reply-To: <d692188ec7f4ef9c4b90d73a4263c4214b8f433d.1658917570.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <d692188ec7f4ef9c4b90d73a4263c4214b8f433d.1658917570.git.mprivozn@redhat.com>
Message-ID: <YuKD3c3+zd4jlCCc@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:57 +0200, Michal Privoznik wrote:
> From: Lin Yang <lin.a.yang at intel.com>
> 
> With NUMA config:
> 
> <devices>
>   ...
>   <memory model='sgx-epc'>
>     <source>
>       <nodemask>0-1</nodemask>
>     </source>
>     <target>
>       <size unit='KiB'>512</size>
>       <node>0</node>
>     </target>
>   </memory>
>   ...
> </devices>
> 
> Without NUMA config:
> 
> <devices>
>   ...
>   <memory model='sgx-epc'>
>     <target>
>       <size unit='KiB'>512</size>
>     </target>
>   </memory>
>   ...
> </devices>
> 
> Signed-off-by: Lin Yang <lin.a.yang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---

[...]

> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
> index 1ed969ac3e..bdd0fcea8e 100644
> --- a/docs/formatdomain.rst
> +++ b/docs/formatdomain.rst
> @@ -7940,6 +7940,20 @@ Example: usage of the memory devices
>           <current unit='KiB'>524288</current>
>         </target>
>       </memory>
> +     <memory model='sgx-epc'>
> +       <source>
> +         <nodemask>0-1</nodemask>
> +       </source>
> +       <target>
> +         <size unit='KiB'>16384</size>
> +         <node>0</node>
> +       </target>
> +     </memory>
> +     <memory model='sgx-epc'>
> +       <target>
> +         <size unit='KiB'>16384</size>
> +       </target>
> +     </memory>
>     </devices>
>     ...
>  
> @@ -7948,7 +7962,9 @@ Example: usage of the memory devices
>     1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.
>     :since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized
>     persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model
> -   to add paravirtualized memory device. :since:`Since 7.9.0`
> +   to add paravirtualized memory device. :since:`Since 7.9.0` Provide
> +   ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.
> +   :since:`Since 8.7.0 and QEMU 6.2.0`

I don't quite understand from this description whether this is real
memory usable by the guest OS or something for internal use by the
hypervisor.

Specifically which leads me to questioning this is that the example
sizes are very tiny compared to real memory sizing.

Additionally in qemuDomainDefValidateMemoryHotplug you are changing the
code to specifically exclude the sizing of the 'sgx-epc' memory devices
from the total size of the memory, but this contrasts with the memory
_not_ being excluded from the initial memory calculation in
virDomainDefGetMemoryInitial which is used to format the initial memory
argument ('-m size=...'). Thus at least one of them is wrong.

If this is not guest usable memory, then the <memory> element should not
be used to bolt this on, but rather add a new element similarly to what
we have when AMD SEV is in use.

>  
>  ``access``
>     An optional attribute ``access`` ( :since:`since 3.2.0` ) that provides
> @@ -8008,6 +8024,13 @@ Example: usage of the memory devices
>       Represents a path in the host that backs the virtio memory module in the
>       guest. It is mandatory.
>  
> +   For model ``sgx-epc`` this element is optional. The following optional
> +   elements may be used:
> +
> +   ``nodemask``
> +      This element can be used to override the default set of NUMA nodes where
> +      the memory would be allocated. :since:`Since 8.7.0 and QEMU 7.0.0`
> +
>  ``target``
>     The mandatory ``target`` element configures the placement and sizing of the
>     added memory from the perspective of the guest.
> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
> index e85cc1f809..a1f64b4fcb 100644
> --- a/src/conf/domain_conf.c
> +++ b/src/conf/domain_conf.c
> @@ -1440,6 +1440,7 @@ VIR_ENUM_IMPL(virDomainMemoryModel,
>                "nvdimm",
>                "virtio-pmem",
>                "virtio-mem",
> +              "sgx-epc",
>  );
>  
>  VIR_ENUM_IMPL(virDomainShmemModel,
> @@ -13303,6 +13304,20 @@ virDomainMemorySourceDefParseXML(xmlNodePtr node,
>          def->nvdimmPath = virXPathString("string(./path)", ctxt);
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if ((nodemask = virXPathString("string(./nodemask)", ctxt))) {
> +            if (virBitmapParse(nodemask, &def->sourceNodes,
> +                               VIR_DOMAIN_CPUMASK_LEN) < 0)
> +                return -1;
> +
> +            if (virBitmapIsAllClear(def->sourceNodes)) {
> +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,

A more appropriate error code would be VIR_ERR_XML_DETAIL or VIR_ERR_INVALID_ARG

> +                               _("Invalid value of 'nodemask': %s"), nodemask);
> +                return -1;
> +            }
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> @@ -13371,6 +13386,7 @@ virDomainMemoryTargetDefParseXML(xmlNodePtr node,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
>      }
> @@ -15167,6 +15183,11 @@ virDomainMemoryFindByDefInternal(virDomainDef *def,
>                  continue;
>              break;
>  
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +            if (!virBitmapEqual(tmp->sourceNodes, mem->sourceNodes))
> +                continue;
> +            break;
> +
>          case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
> @@ -24778,6 +24799,15 @@ virDomainMemorySourceDefFormat(virBuffer *buf,
>          virBufferEscapeString(&childBuf, "<path>%s</path>\n", def->nvdimmPath);
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if (def->sourceNodes) {
> +            if (!(bitmap = virBitmapFormat(def->sourceNodes)))
> +                return -1;
> +
> +            virBufferAsprintf(&childBuf, "<nodemask>%s</nodemask>\n", bitmap);
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;

[...]

> diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> index 764d5b029e..259636f7e7 100644
> --- a/src/qemu/qemu_validate.c
> +++ b/src/qemu/qemu_validate.c
> @@ -5181,6 +5181,14 @@ qemuValidateDomainDeviceDefMemory(virDomainMemoryDef *mem,
>          }
>          break;
>  
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC)) {
> +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> +                           _("sgx epc isn't supported by this QEMU binary"));
> +            return -1;
> +        }
> +        break;
> +
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
> diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c
> index 008384dee8..36e8ce42b5 100644
> --- a/src/security/security_apparmor.c
> +++ b/src/security/security_apparmor.c
> @@ -687,6 +687,7 @@ AppArmorSetMemoryLabel(virSecurityManager *mgr,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
>      }
> diff --git a/src/security/security_dac.c b/src/security/security_dac.c
> index 21cebae694..d94995c9cf 100644
> --- a/src/security/security_dac.c
> +++ b/src/security/security_dac.c
> @@ -1853,6 +1853,7 @@ virSecurityDACRestoreMemoryLabel(virSecurityManager *mgr,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          ret = 0;
> @@ -2040,6 +2041,7 @@ virSecurityDACSetMemoryLabel(virSecurityManager *mgr,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>          ret = 0;
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index 9f2872decc..98044d1847 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -1580,6 +1580,7 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManager *mgr,
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          break;
>      }
> @@ -1608,6 +1609,7 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManager *mgr,
>  
>      case VIR_DOMAIN_MEMORY_MODEL_DIMM:
>      case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +    case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
>      case VIR_DOMAIN_MEMORY_MODEL_NONE:
>      case VIR_DOMAIN_MEMORY_MODEL_LAST:
>          ret = 0;
> diff --git a/tests/qemuxml2argvdata/sgx-epc-numa.xml b/tests/qemuxml2argvdata/sgx-epc-numa.xml
> new file mode 100644
> index 0000000000..9029977f20
> --- /dev/null
> +++ b/tests/qemuxml2argvdata/sgx-epc-numa.xml
> @@ -0,0 +1,64 @@
> +<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'>2</vcpu>
> +  <os>
> +    <type arch='x86_64' machine='q35'>hvm</type>
> +    <boot dev='hd'/>
> +  </os>
> +  <cpu mode='custom' match='exact' check='none'>
> +    <model fallback='forbid'>qemu64</model>
> +    <numa>
> +      <cell id='0' cpus='0' memory='109550' unit='KiB'/>
> +      <cell id='1' cpus='1' memory='109550' 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='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='usb' index='0' model='none'/>
> +    <controller type='sata' index='0'>
> +      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
> +    </controller>
> +    <input type='mouse' bus='ps2'/>
> +    <input type='keyboard' bus='ps2'/>
> +    <audio id='1' type='none'/>
> +    <memballoon model='virtio'>
> +      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
> +    </memballoon>
> +    <memory model='sgx-epc'>
> +      <source>
> +        <nodemask>0-1</nodemask>
> +      </source>
> +      <target>
> +        <size unit='KiB'>65536</size>
> +        <node>0</node>
> +      </target>
> +    </memory>
> +    <memory model='sgx-epc'>
> +      <source>
> +        <nodemask>2-3</nodemask>
> +      </source>
> +      <target>
> +        <size unit='KiB'>16384</size>
> +        <node>1</node>
> +      </target>
> +    </memory>
> +  </devices>
> +</domain>


> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
> index 4cbf380e44..033efad646 100644
> --- a/tests/qemuxml2xmltest.c
> +++ b/tests/qemuxml2xmltest.c
> @@ -1462,6 +1462,9 @@ mymain(void)
>      DO_TEST_CAPS_LATEST("channel-qemu-vdagent");
>      DO_TEST_CAPS_LATEST("channel-qemu-vdagent-features");
>  
> +    DO_TEST_CAPS_VER("sgx-epc", "6.2.0");
> +    DO_TEST_CAPS_LATEST("sgx-epc-numa");

This test will break once I re-generate latest caps. Please pin it to
qemu-7.0.

From pkrempa at redhat.com  Thu Jul 28 12:44:05 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 14:44:05 +0200
Subject: [PATCH v14 12/15] qemu_cgroup: Allow SGX in devices controller
In-Reply-To: <19261f11132e69abaed62411ca8332c231d5ed30.1658917571.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <19261f11132e69abaed62411ca8332c231d5ed30.1658917571.git.mprivozn@redhat.com>
Message-ID: <YuKElRH1EASqrOSw@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:58 +0200, Michal Privoznik wrote:
> SGX memory backend needs to access /dev/sgx_vepc (which allows
> userspace to allocate "raw" EPC without an associated enclave)
> and /dev/sgx_provision (which allows creating provisioning
> enclaves). Allow these two devices in CGroups if a domain is
> configured so.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_cgroup.c | 76 +++++++++++++++++++++++++++++++++++-------
>  src/qemu/qemu_domain.h |  2 ++
>  2 files changed, 66 insertions(+), 12 deletions(-)

[...]

> @@ -538,16 +575,31 @@ qemuTeardownMemoryDevicesCgroup(virDomainObj *vm,
>                                  virDomainMemoryDef *mem)
>  {
>      qemuDomainObjPrivate *priv = vm->privateData;
> -
> -    if (mem->model != VIR_DOMAIN_MEMORY_MODEL_NVDIMM &&
> -        mem->model != VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM)
> -        return 0;
> +    const char *const sgxPaths[] = { QEMU_DEV_SGX_VEPVC,
> +        QEMU_DEV_SGX_PROVISION, NULL };

Preferrably use the same alignment as in qemuSetupMemoryDevicesCgroup.

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Thu Jul 28 12:44:32 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 14:44:32 +0200
Subject: [PATCH v14 13/15] qemu_namespace: Create SGX related nodes in
 domain's namespace
In-Reply-To: <57c62ec15ecc9d8c0894f3128e1ef878a3b39985.1658917571.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <57c62ec15ecc9d8c0894f3128e1ef878a3b39985.1658917571.git.mprivozn@redhat.com>
Message-ID: <YuKEsHsB/ncP7/OU@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:34:59 +0200, Michal Privoznik wrote:
> This is similar to the previous commit. SGX memory backend needs
> to access /dev/sgx_vepc and /dev/sgx_provision. Create these
> nodes in domain's private /dev when required by domain's config.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_namespace.c | 20 ++++++++++++++++----
>  1 file changed, 16 insertions(+), 4 deletions(-)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From pkrempa at redhat.com  Thu Jul 28 12:46:32 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 14:46:32 +0200
Subject: [PATCH v14 14/15] security_dac: Set DAC label on SGX /dev nodes
In-Reply-To: <75067b41c05a8282e45866bd3254ee85b5cb682e.1658917571.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <75067b41c05a8282e45866bd3254ee85b5cb682e.1658917571.git.mprivozn@redhat.com>
Message-ID: <YuKFKN63ChRbCw3d@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:35:00 +0200, Michal Privoznik wrote:
> As advertised in previous commits, QEMU needs to access
> /dev/sgx_vepc and /dev/sgx_provision files when SGX memory
> backend is configured. And if it weren't for QEMU's namespaces,
> we wouldn't dare to relabel them, because they are system wide
> files. But if namespaces are used, then we can set label on
> domain's private copies, just like we do for /dev/sev.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/security/security_dac.c | 46 ++++++++++++++++++++++---------------
>  1 file changed, 28 insertions(+), 18 deletions(-)

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

Isn't something similar needed also for the apparmor driver?

From pkrempa at redhat.com  Thu Jul 28 13:11:24 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 15:11:24 +0200
Subject: [PATCH v14 15/15] qemu: Add command-line to generate SGX EPC
 memory backend
In-Reply-To: <a674efd852c5e90cbca21d1e6e92e269f31fe431.1658917571.git.mprivozn@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <a674efd852c5e90cbca21d1e6e92e269f31fe431.1658917571.git.mprivozn@redhat.com>
Message-ID: <YuKK/GafCVRwS+B8@angien.pipo.sk>

On Wed, Jul 27, 2022 at 12:35:01 +0200, Michal Privoznik wrote:
> From: Lin Yang <lin.a.yang at intel.com>
> 
> According to the result parsing from xml, add the argument of
> SGX EPC memory backend into QEMU command line.
> 
> With NUMA config:
> 
>     #qemu-system-x86_64 \
>         ...... \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216,"host-nodes":[2,3],"policy":"bind"}' \
>         -machine sgx-epc.0.memdev=memepc0,sgx-epc.0.node=0,sgx-epc.1.memdev=memepc1,sgx-epc.1.node=1
> 
> Without NUMA config:
> 
>     #qemu-system-x86_64 \
>         ...... \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"size":67108864}' \
>         -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"size":16777216}' \
>         -machine sgx-epc.0.memdev=memepc0,sgx-epc.1.memdev=memepc1
> 
> Signed-off-by: Lin Yang <lin.a.yang at intel.com>
> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_alias.c                         |  3 +-
>  src/qemu/qemu_command.c                       | 82 +++++++++++++++++--
>  src/qemu/qemu_monitor_json.c                  | 41 ++++++++--
>  .../sgx-epc-numa.x86_64-latest.args           | 40 +++++++++
>  .../sgx-epc.x86_64-6.2.0.args                 | 37 +++++++++
>  tests/qemuxml2argvtest.c                      |  3 +
>  6 files changed, 190 insertions(+), 16 deletions(-)
>  create mode 100644 tests/qemuxml2argvdata/sgx-epc-numa.x86_64-latest.args
>  create mode 100644 tests/qemuxml2argvdata/sgx-epc.x86_64-6.2.0.args

[...]

> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index f3f6870c58..304a2ae6d1 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c

[...]

> @@ -3733,7 +3737,6 @@ qemuBuildMemoryBackendProps(virJSONValue **backendProps,
>  
>          if (systemMemory)
>              disableCanonicalPath = true;
> -
>      } else if (useHugepage || mem->nvdimmPath || memAccess ||

Spurious whitespace change.


>          def->mem.source == VIR_DOMAIN_MEMORY_SOURCE_FILE) {

[...]

> @@ -7094,8 +7100,52 @@ qemuAppendDomainMemoryMachineParams(virBuffer *buf,
>          virBufferAddLit(buf, ",mem-merge=off");
>  
>      for (i = 0; i < def->nmems; i++) {
> -        if (def->mems[i]->model == VIR_DOMAIN_MEMORY_MODEL_NVDIMM) {
> -            virBufferAddLit(buf, ",nvdimm=on");
> +        int targetNode = def->mems[i]->targetNode;
> +
> +        switch (def->mems[i]->model) {
> +        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
> +            if (!nvdimmAdded) {
> +                virBufferAddLit(buf, ",nvdimm=on");
> +                nvdimmAdded = true;
> +            }
> +            break;
> +
> +        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
> +            /* add sgx epc memory to -machine parameter */
> +
> +            if (targetNode < 0) {
> +                /* set NUMA target node to 0 by default if user doesn't
> +                 * specify it. */
> +                targetNode = 0;
> +            }
> +
> +            if (sgxCaps->nsections == 0) {
> +                /* Assume QEMU cannot specify guest NUMA node for each SGX EPC,
> +                 * because it doesn't provide EPC NUMA info
> +                 */

The previous patches in this series spend quite a lot of effort in
extracting the section sizes, but they are not used for anything related
to the actual command generation besides checking the presence.

What is the point of the size reported by qemu then? Is the user
supposed to use it somehow? If there are restrictions, e.g. by requiring
the user to set the size as multiple of the value reported in
capabilities I'd expect that the code would validate that in such case.


> +                if (targetNode > 0) {
> +                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> +                                   _("can't add SGX EPC for guest node '%d' because this QEMU version didn't provide SGX EPC NUMA info"),
> +                                   targetNode);
> +                    return -1;
> +                }
> +
> +                virBufferAsprintf(buf, ",sgx-epc.%d.memdev=mem%s",
> +                                  epcNum, def->mems[i]->info.alias);
> +            } else {
> +                /* The .node attribute is required since QEMU provide EPC NUMA info */
> +                virBufferAsprintf(buf, ",sgx-epc.%d.memdev=mem%s,sgx-epc.%d.node=%d",
> +                                  epcNum, def->mems[i]->info.alias, epcNum, targetNode);
> +            }
> +
> +            epcNum++;
> +            break;
> +
> +        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
> +        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
> +        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
> +        case VIR_DOMAIN_MEMORY_MODEL_NONE:
> +        case VIR_DOMAIN_MEMORY_MODEL_LAST:
>              break;
>          }
>      }

[...]

> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> index b045efa203..c41a6355ba 100644
> --- a/src/qemu/qemu_monitor_json.c
> +++ b/src/qemu/qemu_monitor_json.c
> @@ -7575,13 +7575,25 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon,
>              return -1;
>          }
>  
> -        /* While 'id' attribute is marked as optional in QEMU's QAPI
> -         * specification, Libvirt always sets it. Thus we can fail if not
> -         * present. */
> -        if (!(devalias = virJSONValueObjectGetString(dimminfo, "id"))) {
> -            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> -                           _("dimm memory info data is missing 'id'"));
> -            return -1;
> +        if (STREQ(type, "dimm") || STREQ(type, "nvdimm") || STREQ(type, "virtio-mem")) {
> +            /* While 'id' attribute is marked as optional in QEMU's QAPI
> +            * specification, Libvirt always sets it. Thus we can fail if not
> +            * present. */
> +            if (!(devalias = virJSONValueObjectGetString(dimminfo, "id"))) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                            _("dimm memory info data is missing 'id'"));
> +                return -1;
> +            }
> +        } else if (STREQ(type, "sgx-epc")) {
> +            if (!(devalias = virJSONValueObjectGetString(dimminfo, "memdev"))) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                            _("sgx-epc memory info data is missing 'memdev'"));
> +                return -1;

This code is really looking for the alias of the device frontend, so
that we can match it later on, so looking for the alias of the backend
seems wrong.

Based on the comment below I dont' think this code should even handle
SGX related objects at all.


> +            }
> +        } else {
> +            virReportError(VIR_ERR_INTERNAL_ERROR,
> +                        _("%s memory device info is not handled yet"), type);
> +                return -1;
>          }
>  
>          meminfo = g_new0(qemuMonitorMemoryDeviceInfo, 1);
> @@ -7625,6 +7637,21 @@ qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitor *mon,
>                                 _("malformed/missing size in virtio memory info"));
>                  return -1;
>              }
> +        } else if (STREQ(type, "sgx-epc")) {
> +            /* sgx-epc memory devices */
> +            if (virJSONValueObjectGetNumberUlong(dimminfo, "memaddr",
> +                                                 &meminfo->address) < 0) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                               _("malformed/missing memaddr in sgx-epc memory info"));

In patch 11/15 in code added to virDomainMemoryDefValidate it's
explicitly forbidden to provide address for the 'sgx-epc' memory device,
thus I don't really understand why you collect it here. Can you please
clarify?

The code adding the machine parameters in
qemuAppendDomainMemoryMachineParams doesn't support passing address to
qemu, so if this was needed e.g. for migration it wouldn't even work.

> +                return -1;
> +            }
> +
> +            if (virJSONValueObjectGetNumberUlong(dimminfo, "size",
> +                                                 &meminfo->size) < 0) {
> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> +                               _("malformed/missing size in sgx-epc memory info"));
> +                return -1;
> +            }
>          } else {
>              /* type not handled yet */
>              continue;

[...]

> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 05537d9e96..7a4c09b172 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -3470,6 +3470,9 @@ mymain(void)
>      /* HVF guests should not work on Linux with KVM */
>      DO_TEST_CAPS_LATEST_PARSE_ERROR("hvf-x86_64-q35-headless");
>  
> +    DO_TEST_CAPS_VER("sgx-epc", "6.2.0");
> +    DO_TEST_CAPS_LATEST("sgx-epc-numa");

As noted before, you need to make this test pinned to 7.0.0 or else it
will break when I re-generate capabilities as my box does not support
SGX.

From mprivozn at redhat.com  Thu Jul 28 13:33:33 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Thu, 28 Jul 2022 15:33:33 +0200
Subject: [PATCH] virjson: Change virJSONValueObjectHasKey() signature
Message-ID: <79193fc94035ccd84ae6848cfedc37fe578eecd3.1659015213.git.mprivozn@redhat.com>

Currently, virJSONValueObjectHasKey() can return one of three
values:

  -1 if passed object type is not VIR_JSON_TYPE_OBJECT,
   0 if the key is not present, and finally
   1 if the key is present.

But, neither of callers is interested in the -1 case. In fact,
some callers call this function treating -1 and 1 cases the same.
Therefore, make the function return just true/false and fix few
callers that explicitly checked for == 1 case.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_agent.c        |  8 ++++----
 src/qemu/qemu_monitor_json.c | 10 +++++-----
 src/util/virjson.c           |  8 ++++----
 src/util/virjson.h           |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index d81f01ba77..0d77a2f90d 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -231,12 +231,12 @@ qemuAgentIOProcessLine(qemuAgent *agent,
         return -1;
     }
 
-    if (virJSONValueObjectHasKey(obj, "QMP") == 1) {
+    if (virJSONValueObjectHasKey(obj, "QMP")) {
         return 0;
-    } else if (virJSONValueObjectHasKey(obj, "event") == 1) {
+    } else if (virJSONValueObjectHasKey(obj, "event")) {
         return qemuAgentIOProcessEvent(agent, obj);
-    } else if (virJSONValueObjectHasKey(obj, "error") == 1 ||
-               virJSONValueObjectHasKey(obj, "return") == 1) {
+    } else if (virJSONValueObjectHasKey(obj, "error") ||
+               virJSONValueObjectHasKey(obj, "return")) {
         if (msg) {
             if (msg->sync) {
                 unsigned long long id;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 941596563a..2469165728 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -203,14 +203,14 @@ qemuMonitorJSONIOProcessLine(qemuMonitor *mon,
         return -1;
     }
 
-    if (virJSONValueObjectHasKey(obj, "QMP") == 1) {
+    if (virJSONValueObjectHasKey(obj, "QMP")) {
         return 0;
-    } else if (virJSONValueObjectHasKey(obj, "event") == 1) {
+    } else if (virJSONValueObjectHasKey(obj, "event")) {
         PROBE(QEMU_MONITOR_RECV_EVENT,
               "mon=%p event=%s", mon, line);
         return qemuMonitorJSONIOProcessEvent(mon, obj);
-    } else if (virJSONValueObjectHasKey(obj, "error") == 1 ||
-               virJSONValueObjectHasKey(obj, "return") == 1) {
+    } else if (virJSONValueObjectHasKey(obj, "error") ||
+               virJSONValueObjectHasKey(obj, "return")) {
         PROBE(QEMU_MONITOR_RECV_REPLY,
               "mon=%p reply=%s", mon, line);
         if (msg) {
@@ -270,7 +270,7 @@ qemuMonitorJSONCommandWithFd(qemuMonitor *mon,
 
     memset(&msg, 0, sizeof(msg));
 
-    if (virJSONValueObjectHasKey(cmd, "execute") == 1) {
+    if (virJSONValueObjectHasKey(cmd, "execute")) {
         g_autofree char *id = qemuMonitorNextCommandID(mon);
 
         if (virJSONValueObjectAppendString(cmd, "id", id) < 0) {
diff --git a/src/util/virjson.c b/src/util/virjson.c
index 53f8cdff95..ef59b5deb4 100644
--- a/src/util/virjson.c
+++ b/src/util/virjson.c
@@ -798,21 +798,21 @@ virJSONValueArrayConcat(virJSONValue *a,
 }
 
 
-int
+bool
 virJSONValueObjectHasKey(virJSONValue *object,
                          const char *key)
 {
     size_t i;
 
     if (object->type != VIR_JSON_TYPE_OBJECT)
-        return -1;
+        return false;
 
     for (i = 0; i < object->data.object.npairs; i++) {
         if (STREQ(object->data.object.pairs[i].key, key))
-            return 1;
+            return true;
     }
 
-    return 0;
+    return false;
 }
 
 
diff --git a/src/util/virjson.h b/src/util/virjson.h
index aced48a538..ce181dcb82 100644
--- a/src/util/virjson.h
+++ b/src/util/virjson.h
@@ -88,7 +88,7 @@ int
 virJSONValueArrayConcat(virJSONValue *a,
                         virJSONValue *c);
 
-int
+bool
 virJSONValueObjectHasKey(virJSONValue *object,
                          const char *key);
 virJSONValue *
-- 
2.35.1


From pkrempa at redhat.com  Thu Jul 28 13:50:43 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 15:50:43 +0200
Subject: [PATCH] virjson: Change virJSONValueObjectHasKey() signature
In-Reply-To: <79193fc94035ccd84ae6848cfedc37fe578eecd3.1659015213.git.mprivozn@redhat.com>
References: <79193fc94035ccd84ae6848cfedc37fe578eecd3.1659015213.git.mprivozn@redhat.com>
Message-ID: <YuKUMzKGdk06ZnBe@angien.pipo.sk>

On Thu, Jul 28, 2022 at 15:33:33 +0200, Michal Privoznik wrote:
> Currently, virJSONValueObjectHasKey() can return one of three
> values:
> 
>   -1 if passed object type is not VIR_JSON_TYPE_OBJECT,
>    0 if the key is not present, and finally
>    1 if the key is present.
> 
> But, neither of callers is interested in the -1 case. In fact,
> some callers call this function treating -1 and 1 cases the same.
> Therefore, make the function return just true/false and fix few
> callers that explicitly checked for == 1 case.
> 
> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> ---
>  src/qemu/qemu_agent.c        |  8 ++++----
>  src/qemu/qemu_monitor_json.c | 10 +++++-----
>  src/util/virjson.c           |  8 ++++----
>  src/util/virjson.h           |  2 +-
>  4 files changed, 14 insertions(+), 14 deletions(-)

You forgot to fix one instance in testQEMUSchemaValidateObjectMandatoryMember
which uses '!= 1' instead of '== 1'.

With that fixed:

Reviewed-by: Peter Krempa <pkrempa at redhat.com>

From jdenemar at redhat.com  Thu Jul 28 14:01:40 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Thu, 28 Jul 2022 16:01:40 +0200
Subject: [libvirt PATCH for 8.6.0] qemu_migration_params: Avoid deadlock in
 qemuMigrationParamsReset
Message-ID: <ef04124fa9e038dfd2a44bc75953f980395d6cb5.1659016900.git.jdenemar@redhat.com>

In my recent comnmit v8.5.0-188-gc47f1abb81 I accidentally moved
qemuMigrationParamsResetTLS after qemuDomainObjEnterMonitorAsync not
noticing qemuMigrationParamsResetTLS will try to enter the monitor
again. The second call will time out and return with a domain object
locked. But we're still in monitor section and the object should be
unlocked which means qemuDomainObjExitMonitor will deadlock trying to
lock it again.

Fixes: c47f1abb81194461377a0c608a7ecd87f9ce9146
Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---
 src/qemu/qemu_migration_params.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index be7966a18a..9da2fd6d98 100644
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -1291,6 +1291,7 @@ qemuMigrationParamsReset(virQEMUDriver *driver,
 {
     virErrorPtr err;
     g_autoptr(virBitmap) clearCaps = NULL;
+    int rc;
 
     virErrorPreserveLast(&err);
 
@@ -1305,11 +1306,16 @@ qemuMigrationParamsReset(virQEMUDriver *driver,
 
     clearCaps = virBitmapNew(0);
 
-    if (qemuMigrationParamsApplyCaps(vm, clearCaps) == 0 &&
-        qemuMigrationParamsApplyValues(vm, origParams, false) == 0)
-        qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags);
+    rc = 0;
+    if (qemuMigrationParamsApplyCaps(vm, clearCaps) < 0 ||
+        qemuMigrationParamsApplyValues(vm, origParams, false) < 0)
+        rc = -1;
 
     qemuDomainObjExitMonitor(vm);
+    if (rc < 0)
+        goto cleanup;
+
+    qemuMigrationParamsResetTLS(driver, vm, asyncJob, origParams, apiFlags);
 
  cleanup:
     virErrorRestore(&err);
-- 
2.35.1


From mprivozn at redhat.com  Thu Jul 28 14:05:04 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 28 Jul 2022 16:05:04 +0200
Subject: [PATCH v14 07/15] domain_capabilities: Define SGX capabilities
 structs
In-Reply-To: <YuJKVYjFa49Q2seq@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <0c3261492013cabeaa6652755c3c00ea05934cc8.1658917570.git.mprivozn@redhat.com>
 <YuJDB6v4m4Q079yn@angien.pipo.sk> <YuJKVYjFa49Q2seq@redhat.com>
Message-ID: <4c5999d2-ee58-b4fe-58dc-d4f54ef16a36@redhat.com>

On 7/28/22 10:35, Daniel P. Berrang? wrote:
> On Thu, Jul 28, 2022 at 10:04:23AM +0200, Peter Krempa wrote:
>> On Wed, Jul 27, 2022 at 12:34:53 +0200, Michal Privoznik wrote:
>>> From: Haibin Huang <haibin.huang at intel.com>
>>>
>>> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
>>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>>> ---
>>>  src/conf/domain_capabilities.c | 11 +++++++++++
>>>  src/conf/domain_capabilities.h | 22 ++++++++++++++++++++++
>>>  src/libvirt_private.syms       |  1 +
>>>  3 files changed, 34 insertions(+)
>>
>> [...]
>>
>>> diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
>>> index a526969cda..e4654a65cd 100644
>>> --- a/src/conf/domain_capabilities.h
>>> +++ b/src/conf/domain_capabilities.h
>>> @@ -193,6 +193,22 @@ struct _virSEVCapability {
>>>      unsigned int max_es_guests;
>>>  };
>>>  
>>> +typedef struct _virSection virSection;
>>
>> This name feels a bit too generic and not much reusable. On the other
>> hand changing it feels pointless.

Ooops yes, of course. Been looking too much into these patches lately.

> 
> Clearly it should be   virSGXSection 

Indeed, fixed.

Michal


From mprivozn at redhat.com  Thu Jul 28 14:05:08 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 28 Jul 2022 16:05:08 +0200
Subject: [PATCH v14 08/15] qemu: Get SGX capabilities form QMP
In-Reply-To: <YuJFqzsAlPvdvC0J@angien.pipo.sk>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <42c52bebf36031a405c356167603aa2fa310d2a9.1658917570.git.mprivozn@redhat.com>
 <YuJFqzsAlPvdvC0J@angien.pipo.sk>
Message-ID: <4e985adf-062e-5586-0a1d-8d49c6eaaaff@redhat.com>

On 7/28/22 10:15, Peter Krempa wrote:
> On Wed, Jul 27, 2022 at 12:34:54 +0200, Michal Privoznik wrote:
>> From: Haibin Huang <haibin.huang at intel.com>
>>
>> Generate the QMP command for query-sgx-capabilities and the command
>> return SGX capabilities from QMP.
>>
>> {"execute":"query-sgx-capabilities"}
>>
>> the right reply:
>>   {"return":
>>     {
>>       "sgx": true,
>>       "section-size": 197132288,
>>       "flc": true
>>     }
>>   }
>>
>> the error reply:
>>   {"error":
>>     {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
>>   }
>>
>> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
>>  src/qemu/qemu_monitor.c      |  10 ++++
>>  src/qemu/qemu_monitor.h      |   3 +
>>  src/qemu/qemu_monitor_json.c | 107 +++++++++++++++++++++++++++++++++++
>>  src/qemu/qemu_monitor_json.h |   4 ++
>>  4 files changed, 124 insertions(+)
> 
> [...]
> 
>> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
>> index 941596563a..b045efa203 100644
>> --- a/src/qemu/qemu_monitor_json.c
>> +++ b/src/qemu/qemu_monitor_json.c
>> @@ -6395,6 +6395,113 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
>>      return 1;
>>  }
>>  
>> +
>> +/**
>> + * qemuMonitorJSONGetSGXCapabilities:
>> + * @mon: qemu monitor object
>> + * @capabilities: pointer to pointer to a SGX capability structure to be filled
>> + *
>> + * This function queries and fills in INTEL's SGX platform-specific data.
>> + * Note that from QEMU's POV both -object sgx-epc and query-sgx-capabilities
>> + * can be present even if SGX is not available, which basically leaves us with
>> + * checking for JSON "GenericError" in order to differentiate between compiled-in
>> + * support and actual SGX support on the platform.
>> + *
>> + * Returns: -1 on error,
>> + *           0 if SGX is not supported, and
>> + *           1 if SGX is supported on the platform.
>> + */
>> +int
>> +qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
>> +                                  virSGXCapability **capabilities)
>> +{
>> +    g_autoptr(virJSONValue) cmd = NULL;
>> +    g_autoptr(virJSONValue) reply = NULL;
>> +    g_autoptr(virSGXCapability) capability = NULL;
>> +    virJSONValue *sections = NULL;
>> +    virJSONValue *caps;
>> +    bool flc = false;
>> +    bool sgx1 = false;
>> +    bool sgx2 = false;
> 
> These temporary booleans feel a bit redundant ...
> 
>> +    unsigned long long section_size = 0;
>> +    unsigned long long size;
>> +    size_t i;
>> +
>> +    *capabilities = NULL;
>> +    capability = g_new0(virSGXCapability, 1);
>> +
>> +    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities", NULL)))
>> +        return -1;
>> +
>> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
>> +        return -1;
>> +
>> +    /* QEMU has only compiled-in support of SGX */
>> +    if (qemuMonitorJSONHasError(reply, "GenericError"))
>> +        return 0;
>> +
>> +    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
>> +        return -1;
>> +
>> +    caps = virJSONValueObjectGetObject(reply, "return");
>> +
>> +    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
>> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                       _("query-sgx-capabilities reply was missing 'flc' field"));
>> +        return -1;
>> +    }
>> +    capability->flc = flc;
> 
> Because you assign the value directly back to the struct. Passing the
> pointer to the field in the struct directly to
> virJSONValueObjectGetBoolean avoids the need.
> 
>> +
>> +    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
>> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
>> +        return -1;
>> +    }
>> +    capability->sgx1 = sgx1;
>> +
>> +    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
>> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
>> +        return -1;
>> +    }
>> +    capability->sgx2 = sgx2;
>> +
>> +    if (virJSONValueObjectGetNumberUlong(caps, "section-size", &section_size) < 0) {
>> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                       _("query-sgx-capabilities reply was missing 'section-size' field"));
>> +        return -1;
>> +    }
>> +    capability->section_size = section_size / 1024;
> 
> The 'section-size' field is marked as deprecated in the QMP schema. Thus
> we must not report error if it vanishes.
> 
> Is there any reason to extract it in the first place?
> 
> If yes, the code must be fixed to handle the possibility properly.

The idea is that this allows us to work with qemu-6.2.0 and qemu-7.0.0;
The former reports section-size only, the latter marked it obsolete and
reports array of 'sections' so that sections per NUMA node can be
reported. Now, section-size is nothing but a sum of individual per NUMA
node sections. So I guess we can do the summation once QEMU stops
reporting it.

NB, presence of per NUMA node sections (this code below) is then used
when generating cmd line, because qemu-7.0.0 requires slightly different
cmd line (due to those NUMA nodes).

Alternatively, we may pronounce qemu-6.2.0 not worth supporting and aim
on 7.0.0 only and not deal with deprecated interface at all (i.e. don't
parse/report aggregated sum).

> 
>> +
>> +    if ((sections = virJSONValueObjectGetArray(caps, "sections"))) {
>> +        /* Got the section, the QEMU version is above 7.0.0 */
>> +        capability->nsections = virJSONValueArraySize(sections);
>> +        capability->sections = g_new0(virSection, capability->nsections);
>> +
>> +        for (i = 0; i < capability->nsections; i++) {
>> +            virJSONValue *elem = virJSONValueArrayGet(sections, i);
>> +
>> +            if (virJSONValueObjectGetNumberUlong(elem, "size", &size) < 0) {
>> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                               _("query-sgx-capabilities reply was missing 'size' field"));
>> +                return -1;
>> +            }
>> +            capability->sections[i].size = size / 1024;
>> +
>> +            if (virJSONValueObjectGetNumberInt(elem, "node",
>> +                                               &capability->sections[i].node) < 0) {
>> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                               _("query-sgx-capabilities reply was missing 'node' field"));
>> +                return -1;
>> +            }
>> +        }
>> +    }
>> +
>> +    *capabilities = g_steal_pointer(&capability);
>> +    return 1;
>> +}
>> +
>> +
>>  static virJSONValue *
>>  qemuMonitorJSONBuildInetSocketAddress(const char *host,
>>                                        const char *port)
> 

Michal


From mprivozn at redhat.com  Thu Jul 28 14:05:08 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Thu, 28 Jul 2022 16:05:08 +0200
Subject: [PATCH v14 09/15] Convert QMP capabilities to domain capabilities
In-Reply-To: <YuJOg8uc9MrVZTlj@angien.pipo.sk>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <a003713dba87682cb1c2700a2e3de1174940c936.1658917570.git.mprivozn@redhat.com>
 <YuJOg8uc9MrVZTlj@angien.pipo.sk>
Message-ID: <1dfc2734-3fe2-cd10-9629-2fb91537cc09@redhat.com>

On 7/28/22 10:53, Peter Krempa wrote:
> On Wed, Jul 27, 2022 at 12:34:55 +0200, Michal Privoznik wrote:
>> From: Haibin Huang <haibin.huang at intel.com>
>>
>> the QMP capabilities:
>>   {"return":
>>     {
>>       "sgx": true,
>>       "section-size": 1024,
>>       "flc": true
>>     }
>>   }
>>
>> the domain capabilities:
>>   <sgx>
>>     <flc>yes</flc>
>>     <epc_size>1</epc_size>
>>   </sgx>
>>
>> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
>>  src/qemu/qemu_capabilities.c                  | 206 ++++++++++++++++++
>>  src/qemu/qemu_capabilities.h                  |   6 +
>>  .../caps_6.2.0.x86_64.replies                 |  24 +-
>>  .../caps_6.2.0.x86_64.xml                     |   7 +
>>  .../caps_7.0.0.x86_64.replies                 |  34 ++-
>>  .../caps_7.0.0.x86_64.xml                     |  11 +
>>  .../caps_7.1.0.x86_64.replies                 |  34 ++-
>>  .../caps_7.1.0.x86_64.xml                     |  11 +
> 
> Preferrably do not mix addition to capability probing with other stuff
> such as the capabiltiies XML formatter/parser next time.
> 
> You can always add the formatter/parser first and then do the minimum
> required to add capability flag and probe it.

Fair enough, let me split it.

> 
>>  8 files changed, 321 insertions(+), 12 deletions(-)
> 
> [...]
> 
>> @@ -1973,6 +1979,36 @@ virQEMUCapsSEVInfoCopy(virSEVCapability **dst,
>>  }
>>  
>>  
>> +static int
>> +virQEMUCapsSGXInfoCopy(virSGXCapability **dst,
>> +                       virSGXCapability *src)
>> +{
>> +    g_autoptr(virSGXCapability) tmp = NULL;
>> +
>> +    if (!src) {
>> +        *dst = NULL;
>> +        return 0;
>> +    }
>> +
>> +    tmp = g_new0(virSGXCapability, 1);
>> +
>> +    tmp->flc = src->flc;
>> +    tmp->sgx1 = src->sgx1;
>> +    tmp->sgx2 = src->sgx2;
>> +    tmp->section_size = src->section_size;
>> +
>> +    if (src->nsections > 0) {
>> +        tmp->sections = g_new0(virSection, src->nsections);
>> +        memcpy(tmp->sections, src->sections,
>> +               src->nsections * sizeof(*tmp->sections));
>> +        tmp->nsections = src->nsections;
>> +    }
>> +
>> +    *dst = g_steal_pointer(&tmp);
>> +    return 0;
>> +}
>> +
>> +
>>  static void
>>  virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccel *dst,
>>                                   virQEMUCapsAccel *src)
>> @@ -2054,6 +2090,12 @@ virQEMUCaps *virQEMUCapsNewCopy(virQEMUCaps *qemuCaps)
>>                                 qemuCaps->sevCapabilities) < 0)
>>          return NULL;
>>  
>> +
>> +    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC) &&
> 
> This doesn't seem to be needed ...
> 
>> +        virQEMUCapsSGXInfoCopy(&ret->sgxCapabilities,
> 
> as this doesn't copy anything if 'src' is NULL.
> 
>> +                               qemuCaps->sgxCapabilities) < 0)
>> +        return NULL;
>> +
>>      return g_steal_pointer(&ret);
>>  }
>>  
> 
> [...]
> 
>> @@ -4221,6 +4296,98 @@ virQEMUCapsParseSEVInfo(virQEMUCaps *qemuCaps, xmlXPathContextPtr ctxt)
>>  }
>>  
>>  
>> +static int
>> +virQEMUCapsParseSGXInfo(virQEMUCaps *qemuCaps,
>> +                        xmlXPathContextPtr ctxt)
>> +{
>> +    g_autoptr(virSGXCapability) sgx = NULL;
>> +    xmlNodePtr sections = NULL;
>> +    g_autofree char *flc = NULL;
>> +    g_autofree char *sgx1 = NULL;
>> +    g_autofree char *sgx2 = NULL;
>> +
>> +    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SGX_EPC))
>> +        return 0;
> 
> Note that this flag

Yep, noted :-D

> 
>> +
>> +    if (virXPathBoolean("boolean(./sgx)", ctxt) == 0) {
>> +        virReportError(VIR_ERR_XML_ERROR, "%s",
>> +                       _("missing SGX platform data in QEMU capabilities cache"));
>> +        return -1;
>> +    }
>> +
>> +    sgx = g_new0(virSGXCapability, 1);
>> +
>> +    if ((!(flc = virXPathString("string(./sgx/flc)", ctxt))) ||
>> +        virStringParseYesNo(flc, &sgx->flc) < 0) {
>> +        virReportError(VIR_ERR_XML_ERROR, "%s",
>> +                       _("missing or invalid SGX platform flc in QEMU capabilities cache"));
>> +        return -1;
>> +    }
>> +
>> +    if ((!(sgx1 = virXPathString("string(./sgx/sgx1)", ctxt))) ||
>> +        virStringParseYesNo(sgx1, &sgx->sgx1) < 0) {
>> +        virReportError(VIR_ERR_XML_ERROR, "%s",
>> +                       _("missing or invalid SGX platform sgx1 in QEMU capabilities cache"));
>> +        return -1;
>> +    }
>> +
>> +    if ((!(sgx2 = virXPathString("string(./sgx/sgx2)", ctxt))) ||
>> +        virStringParseYesNo(sgx2, &sgx->sgx2) < 0) {
>> +        virReportError(VIR_ERR_XML_ERROR, "%s",
>> +                       _("missing or invalid SGX platform sgx2 in QEMU capabilities cache"));
>> +        return -1;
>> +    }
>> +
>> +    if (virXPathULongLong("string(./sgx/section_size)", ctxt,
>> +                          &sgx->section_size) < 0) {
>> +        virReportError(VIR_ERR_XML_ERROR, "%s",
>> +                       _("missing or malformed SGX platform section_size in QEMU capabilities cache"));
>> +        return -1;
>> +    }
>> +
>> +    if ((sections = virXPathNode("./sgx/sections", ctxt))) {
>> +        g_autofree xmlNodePtr *sectionNodes = NULL;
>> +        int nsections = 0;
>> +        size_t i;
>> +        VIR_XPATH_NODE_AUTORESTORE(ctxt);
>> +
>> +        ctxt->node = sections;
>> +        nsections = virXPathNodeSet("./section", ctxt, &sectionNodes);
>> +
>> +        if (nsections < 0) {
>> +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                           _("failed to parse SGX sections in QEMU capabilities cache"));
>> +            return -1;
>> +        }
>> +
>> +        sgx->nsections = nsections;
>> +        sgx->sections = g_new0(virSection, nsections);
>> +
>> +        for (i = 0; i < nsections; i++) {
>> +            g_autofree char * strNode = NULL;
>> +            g_autofree char * strSize = NULL;
>> +
>> +            if (!(strNode = virXMLPropString(sectionNodes[i], "node")) ||
>> +                virStrToLong_i(strNode, NULL, 10, &sgx->sections[i].node) < 0) {
> 
> We have helpers such as virXMLPropUInt and similar, removing the need
> for temporary strings and explicit parsing of the numbers.
> 
> I'd prefer if you use them instead of this open coding .... in the whole
> function.
> 
>> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                               _("missing node name in QEMU capabilities cache"));
>> +                return -1;
>> +            }
>> +
>> +            if (!(strSize = virXMLPropString(sectionNodes[i], "size")) ||
>> +                virStrToLong_ull(strSize, NULL, 10, &(sgx->sections[i].size)) < 0) {
>> +                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
>> +                               _("missing size name in QEMU capabilities cache"));
>> +                return -1;
>> +            }
>> +        }
>> +    }
>> +
>> +    qemuCaps->sgxCapabilities = g_steal_pointer(&sgx);
>> +    return 0;
>> +}
>> +
>> +
> 
> [...]
> 
>> +static void
>> +virQEMUCapsFormatSGXInfo(virQEMUCaps *qemuCaps,
>> +                         virBuffer *buf)
>> +{
>> +    virSGXCapability *sgx = virQEMUCapsGetSGXCapabilities(qemuCaps);
>> +
>> +    virBufferAddLit(buf, "<sgx supported='yes'>\n");
>> +    virBufferAdjustIndent(buf, 2);
>> +    virBufferAsprintf(buf, "<flc>%s</flc>\n", sgx->flc ? "yes" : "no");
>> +    virBufferAsprintf(buf, "<sgx1>%s</sgx1>\n", sgx->sgx1 ? "yes" : "no");
>> +    virBufferAsprintf(buf, "<sgx2>%s</sgx2>\n", sgx->sgx2 ? "yes" : "no");
>> +    virBufferAsprintf(buf, "<section_size unit='KiB'>%llu</section_size>\n", sgx->section_size);
> 
> If the 'section_size' vanishes from qemu, will this field need to be
> removed?
> 
>> +
>> +    if (sgx->nsections > 0) {
>> +        size_t i;
>> +        virBufferAddLit(buf, "<sections>\n");
>> +
>> +        for (i = 0; i < sgx->nsections; i++) {
>> +            virBufferAdjustIndent(buf, 2);
>> +            virBufferAsprintf(buf, "<section node='%u' ", sgx->sections[i].node);
>> +            virBufferAsprintf(buf, "size='%llu'/>\n", sgx->sections[i].size);
>> +            virBufferAdjustIndent(buf, -2);
>> +        }
>> +        virBufferAddLit(buf, "</sections>\n");
>> +    }
>> +
>> +    virBufferAdjustIndent(buf, -2);
>> +    virBufferAddLit(buf, "</sgx>\n");
>> +}
>> +
>> +
>>  char *
>>  virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
>>  {
>> @@ -4789,6 +4990,9 @@ virQEMUCapsFormatCache(virQEMUCaps *qemuCaps)
>>      if (qemuCaps->sevCapabilities)
>>          virQEMUCapsFormatSEVInfo(qemuCaps, &buf);
>>  
>> +    if (qemuCaps->sgxCapabilities)
> 
> As example for my comment about copying the caps, here you don't check
> the capability.
> 
>> +        virQEMUCapsFormatSGXInfo(qemuCaps, &buf);
>> +
>>      if (qemuCaps->kvmSupportsNesting)
>>          virBufferAddLit(&buf, "<kvmSupportsNesting/>\n");
>>  
> 
> [...]
> capability->sections[i].size
>> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
>> index d893d67ea8..c221b9e034 100644
>> --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
>> +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.replies
>> @@ -34006,6 +34006,32 @@
>>    }
>>  }
>>  
>> +{
>> +  "execute": "query-sgx-capabilities",
>> +  "id": "libvirt-51"
>> +}
>> +
>> +{
>> +  "return": {
>> +    "sgx": true,
>> +    "flc": false,
>> +    "sgx1": true,
>> +    "sgx2": false,
>> +    "section-size": 2048,
>> +    "sections": [
>> +      {
>> +        "node": 0,
>> +        "size": 1024
>> +      },
>> +      {
>> +        "node": 1,
>> +        "size": 1024
>> +      }
> 
> Next time I'll be re-generating the capabilities this will get
> overwritten by:
> 
> +  "id": "libvirt-51",
> +  "error": {
> +    "class": "GenericError",
> +    "desc": "SGX is not enabled in KVM"
> +  }
> 
> 
> as my box does not support it. I'd strongly prefer to use this syntax to
> avoid changes in my caps bump patch.
> 

Alright. We have examples in other versions to show the code working.

Michal


From pkrempa at redhat.com  Thu Jul 28 14:20:42 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Thu, 28 Jul 2022 16:20:42 +0200
Subject: [PATCH v14 08/15] qemu: Get SGX capabilities form QMP
In-Reply-To: <4e985adf-062e-5586-0a1d-8d49c6eaaaff@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <42c52bebf36031a405c356167603aa2fa310d2a9.1658917570.git.mprivozn@redhat.com>
 <YuJFqzsAlPvdvC0J@angien.pipo.sk>
 <4e985adf-062e-5586-0a1d-8d49c6eaaaff@redhat.com>
Message-ID: <YuKbOt+1yric0DAA@angien.pipo.sk>

On Thu, Jul 28, 2022 at 16:05:08 +0200, Michal Pr?vozn?k wrote:
> On 7/28/22 10:15, Peter Krempa wrote:
> > On Wed, Jul 27, 2022 at 12:34:54 +0200, Michal Privoznik wrote:
> >> From: Haibin Huang <haibin.huang at intel.com>
> >>
> >> Generate the QMP command for query-sgx-capabilities and the command
> >> return SGX capabilities from QMP.
> >>
> >> {"execute":"query-sgx-capabilities"}
> >>
> >> the right reply:
> >>   {"return":
> >>     {
> >>       "sgx": true,
> >>       "section-size": 197132288,
> >>       "flc": true
> >>     }
> >>   }
> >>
> >> the error reply:
> >>   {"error":
> >>     {"class": "GenericError", "desc": "SGX is not enabled in KVM"}
> >>   }
> >>
> >> Signed-off-by: Haibin Huang <haibin.huang at intel.com>
> >> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> >> ---
> >>  src/qemu/qemu_monitor.c      |  10 ++++
> >>  src/qemu/qemu_monitor.h      |   3 +
> >>  src/qemu/qemu_monitor_json.c | 107 +++++++++++++++++++++++++++++++++++
> >>  src/qemu/qemu_monitor_json.h |   4 ++
> >>  4 files changed, 124 insertions(+)
> > 
> > [...]
> > 
> >> diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
> >> index 941596563a..b045efa203 100644
> >> --- a/src/qemu/qemu_monitor_json.c
> >> +++ b/src/qemu/qemu_monitor_json.c
> >> @@ -6395,6 +6395,113 @@ qemuMonitorJSONGetSEVCapabilities(qemuMonitor *mon,
> >>      return 1;
> >>  }
> >>  
> >> +
> >> +/**
> >> + * qemuMonitorJSONGetSGXCapabilities:
> >> + * @mon: qemu monitor object
> >> + * @capabilities: pointer to pointer to a SGX capability structure to be filled
> >> + *
> >> + * This function queries and fills in INTEL's SGX platform-specific data.
> >> + * Note that from QEMU's POV both -object sgx-epc and query-sgx-capabilities
> >> + * can be present even if SGX is not available, which basically leaves us with
> >> + * checking for JSON "GenericError" in order to differentiate between compiled-in
> >> + * support and actual SGX support on the platform.
> >> + *
> >> + * Returns: -1 on error,
> >> + *           0 if SGX is not supported, and
> >> + *           1 if SGX is supported on the platform.
> >> + */
> >> +int
> >> +qemuMonitorJSONGetSGXCapabilities(qemuMonitor *mon,
> >> +                                  virSGXCapability **capabilities)
> >> +{
> >> +    g_autoptr(virJSONValue) cmd = NULL;
> >> +    g_autoptr(virJSONValue) reply = NULL;
> >> +    g_autoptr(virSGXCapability) capability = NULL;
> >> +    virJSONValue *sections = NULL;
> >> +    virJSONValue *caps;
> >> +    bool flc = false;
> >> +    bool sgx1 = false;
> >> +    bool sgx2 = false;
> > 
> > These temporary booleans feel a bit redundant ...
> > 
> >> +    unsigned long long section_size = 0;
> >> +    unsigned long long size;
> >> +    size_t i;
> >> +
> >> +    *capabilities = NULL;
> >> +    capability = g_new0(virSGXCapability, 1);
> >> +
> >> +    if (!(cmd = qemuMonitorJSONMakeCommand("query-sgx-capabilities", NULL)))
> >> +        return -1;
> >> +
> >> +    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
> >> +        return -1;
> >> +
> >> +    /* QEMU has only compiled-in support of SGX */
> >> +    if (qemuMonitorJSONHasError(reply, "GenericError"))
> >> +        return 0;
> >> +
> >> +    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
> >> +        return -1;
> >> +
> >> +    caps = virJSONValueObjectGetObject(reply, "return");
> >> +
> >> +    if (virJSONValueObjectGetBoolean(caps, "flc", &flc) < 0) {
> >> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> >> +                       _("query-sgx-capabilities reply was missing 'flc' field"));
> >> +        return -1;
> >> +    }
> >> +    capability->flc = flc;
> > 
> > Because you assign the value directly back to the struct. Passing the
> > pointer to the field in the struct directly to
> > virJSONValueObjectGetBoolean avoids the need.
> > 
> >> +
> >> +    if (virJSONValueObjectGetBoolean(caps, "sgx1", &sgx1) < 0) {
> >> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> >> +                       _("query-sgx-capabilities reply was missing 'sgx1' field"));
> >> +        return -1;
> >> +    }
> >> +    capability->sgx1 = sgx1;
> >> +
> >> +    if (virJSONValueObjectGetBoolean(caps, "sgx2", &sgx2) < 0) {
> >> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> >> +                       _("query-sgx-capabilities reply was missing 'sgx2' field"));
> >> +        return -1;
> >> +    }
> >> +    capability->sgx2 = sgx2;
> >> +
> >> +    if (virJSONValueObjectGetNumberUlong(caps, "section-size", &section_size) < 0) {
> >> +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
> >> +                       _("query-sgx-capabilities reply was missing 'section-size' field"));
> >> +        return -1;
> >> +    }
> >> +    capability->section_size = section_size / 1024;
> > 
> > The 'section-size' field is marked as deprecated in the QMP schema. Thus
> > we must not report error if it vanishes.
> > 
> > Is there any reason to extract it in the first place?
> > 
> > If yes, the code must be fixed to handle the possibility properly.
> 
> The idea is that this allows us to work with qemu-6.2.0 and qemu-7.0.0;
> The former reports section-size only, the latter marked it obsolete and
> reports array of 'sections' so that sections per NUMA node can be
> reported. Now, section-size is nothing but a sum of individual per NUMA
> node sections. So I guess we can do the summation once QEMU stops
> reporting it.

Either way, we must not report an error if it is not present, because
we'd specifically be adding code that will break in the future.

> NB, presence of per NUMA node sections (this code below) is then used
> when generating cmd line, because qemu-7.0.0 requires slightly different
> cmd line (due to those NUMA nodes).
> 
> Alternatively, we may pronounce qemu-6.2.0 not worth supporting and aim
> on 7.0.0 only and not deal with deprecated interface at all (i.e. don't
> parse/report aggregated sum).

I'm definitely for skipping 6.2 if possible rather than have code which
is going to work for one release only.

From jinlei_dlut at 163.com  Fri Jul 29 05:52:19 2022
From: jinlei_dlut at 163.com (jlwang)
Date: Fri, 29 Jul 2022 13:52:19 +0800 (CST)
Subject: Feature proposal: support setting block I/O throttling for
 vhostuser disk
Message-ID: <5f39c3d9.2bc2.182488348b6.Coremail.jinlei_dlut@163.com>

Hi,

    blkdeviotune command don't support setting I/O throttlig for vhostuser disk.

    We propose to commit patch to support the feature.

    Are there any issues that would prevent this feature from being accepted?

Thanks,

Wang Jinlei
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220729/66c0637b/attachment.htm>

From mprivozn at redhat.com  Fri Jul 29 06:35:49 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 29 Jul 2022 08:35:49 +0200
Subject: [libvirt PATCH for 8.6.0] qemu_migration_params: Avoid deadlock
 in qemuMigrationParamsReset
In-Reply-To: <ef04124fa9e038dfd2a44bc75953f980395d6cb5.1659016900.git.jdenemar@redhat.com>
References: <ef04124fa9e038dfd2a44bc75953f980395d6cb5.1659016900.git.jdenemar@redhat.com>
Message-ID: <e32733f5-d307-834f-4d9e-2850d4f57be6@redhat.com>

On 7/28/22 16:01, Jiri Denemark wrote:
> In my recent comnmit v8.5.0-188-gc47f1abb81 I accidentally moved
> qemuMigrationParamsResetTLS after qemuDomainObjEnterMonitorAsync not
> noticing qemuMigrationParamsResetTLS will try to enter the monitor
> again. The second call will time out and return with a domain object
> locked. But we're still in monitor section and the object should be
> unlocked which means qemuDomainObjExitMonitor will deadlock trying to
> lock it again.
> 
> Fixes: c47f1abb81194461377a0c608a7ecd87f9ce9146
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
>  src/qemu/qemu_migration_params.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)


Reviewed-by: Michal Privoznik <mprivozn at redhat.com>

Michal


From mprivozn at redhat.com  Fri Jul 29 07:38:35 2022
From: mprivozn at redhat.com (=?UTF-8?B?TWljaGFsIFByw612b3puw61r?=)
Date: Fri, 29 Jul 2022 09:38:35 +0200
Subject: [PATCH v14 11/15] conf: Introduce SGX EPC element into device
 memory xml
In-Reply-To: <YuKD3c3+zd4jlCCc@angien.pipo.sk>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <d692188ec7f4ef9c4b90d73a4263c4214b8f433d.1658917570.git.mprivozn@redhat.com>
 <YuKD3c3+zd4jlCCc@angien.pipo.sk>
Message-ID: <b420073d-8923-4c97-03f4-1550be303d8c@redhat.com>

On 7/28/22 14:41, Peter Krempa wrote:
> On Wed, Jul 27, 2022 at 12:34:57 +0200, Michal Privoznik wrote:
>> From: Lin Yang <lin.a.yang at intel.com>
>>
>> With NUMA config:
>>
>> <devices>
>>   ...
>>   <memory model='sgx-epc'>
>>     <source>
>>       <nodemask>0-1</nodemask>
>>     </source>
>>     <target>
>>       <size unit='KiB'>512</size>
>>       <node>0</node>
>>     </target>
>>   </memory>
>>   ...
>> </devices>
>>
>> Without NUMA config:
>>
>> <devices>
>>   ...
>>   <memory model='sgx-epc'>
>>     <target>
>>       <size unit='KiB'>512</size>
>>     </target>
>>   </memory>
>>   ...
>> </devices>
>>
>> Signed-off-by: Lin Yang <lin.a.yang at intel.com>
>> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
>> ---
> 
> [...]
> 
>> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
>> index 1ed969ac3e..bdd0fcea8e 100644
>> --- a/docs/formatdomain.rst
>> +++ b/docs/formatdomain.rst
>> @@ -7940,6 +7940,20 @@ Example: usage of the memory devices
>>           <current unit='KiB'>524288</current>
>>         </target>
>>       </memory>
>> +     <memory model='sgx-epc'>
>> +       <source>
>> +         <nodemask>0-1</nodemask>
>> +       </source>
>> +       <target>
>> +         <size unit='KiB'>16384</size>
>> +         <node>0</node>
>> +       </target>
>> +     </memory>
>> +     <memory model='sgx-epc'>
>> +       <target>
>> +         <size unit='KiB'>16384</size>
>> +       </target>
>> +     </memory>
>>     </devices>
>>     ...
>>  
>> @@ -7948,7 +7962,9 @@ Example: usage of the memory devices
>>     1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.
>>     :since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized
>>     persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model
>> -   to add paravirtualized memory device. :since:`Since 7.9.0`
>> +   to add paravirtualized memory device. :since:`Since 7.9.0` Provide
>> +   ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.
>> +   :since:`Since 8.7.0 and QEMU 6.2.0`
> 
> I don't quite understand from this description whether this is real
> memory usable by the guest OS or something for internal use by the
> hypervisor.
> 
> Specifically which leads me to questioning this is that the example
> sizes are very tiny compared to real memory sizing.

I admit that I don't know all the details and let somebody from Intel to
provide them. But basically, SGX works by reserving a chunk of RAM (on
each NUMA node) which is then encrypted and the processor controls
access to it. This chunk is referred to as Processor Reserved Memory and
to my understanding is the maximum size of an enclave. Thus I can
understand why new <memory/> model was used. But I'm not sure how QEMU
accounts for this memory, whether say 16KiB worth of SGX is added to
whatever current guest has OR it's taken from an existing memory.

> 
> Additionally in qemuDomainDefValidateMemoryHotplug you are changing the
> code to specifically exclude the sizing of the 'sgx-epc' memory devices
> from the total size of the memory, but this contrasts with the memory
> _not_ being excluded from the initial memory calculation in
> virDomainDefGetMemoryInitial which is used to format the initial memory
> argument ('-m size=...'). Thus at least one of them is wrong.
> 
> If this is not guest usable memory, then the <memory> element should not
> be used to bolt this on, but rather add a new element similarly to what
> we have when AMD SEV is in use.
> 

Alright, I'm hold off reworking these patches per your review until we
are clear on this.

Michal


From mprivozn at redhat.com  Fri Jul 29 07:42:10 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri, 29 Jul 2022 09:42:10 +0200
Subject: [PATCH 0/3] testutilsqemu: Fake TPM versions
Message-ID: <cover.1659080395.git.mprivozn@redhat.com>

I thought I've sent these before the freeze but as I tried to ping them,
I realize I didn't. I'm not sure how critical these are to get into the
release (after all we see no test failing), but they make at least
VIR_TEST_DEBUG output of domcapabilities cleaner.

Michal Pr?vozn?k (3):
  virtpm: Use corresponding type for argument for virTPM*CapsGet()
  testutilsqemu: Mock virTPMSwtpmSetupCapsGet()
  testutilsqemu: Fake TPM versions

 src/util/virtpm.c                             |  4 ++--
 src/util/virtpm.h                             |  6 +++---
 .../domaincapsdata/qemu_3.1.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_4.0.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_4.1.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml     |  4 ++++
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  4 ++++
 .../qemu_5.0.0-virt.aarch64.xml               |  4 ++++
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml   |  4 ++++
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml     |  4 ++++
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |  4 ++++
 .../qemu_5.2.0-virt.aarch64.xml               |  4 ++++
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml   |  4 ++++
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml     |  4 ++++
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |  4 ++++
 .../qemu_6.0.0-virt.aarch64.xml               |  4 ++++
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml   |  4 ++++
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |  4 ++++
 .../qemu_6.2.0-virt.aarch64.xml               |  4 ++++
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml   |  4 ++++
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml     |  4 ++++
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |  4 ++++
 .../qemu_7.0.0-virt.aarch64.xml               |  4 ++++
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml   |  4 ++++
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml     |  4 ++++
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |  4 ++++
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |  4 ++++
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |  4 ++++
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |  4 ++++
 tests/testutilsqemu.c                         | 19 +++++++++++++++++++
 54 files changed, 228 insertions(+), 5 deletions(-)

-- 
2.35.1


From mprivozn at redhat.com  Fri Jul 29 07:42:12 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri, 29 Jul 2022 09:42:12 +0200
Subject: [PATCH 2/3] testutilsqemu: Mock virTPMSwtpmSetupCapsGet()
In-Reply-To: <cover.1659080395.git.mprivozn@redhat.com>
References: <cover.1659080395.git.mprivozn@redhat.com>
Message-ID: <182a0ab2295f889aba625d391e0b45e78d7c1e34.1659080395.git.mprivozn@redhat.com>

In a recent commit of v8.5.0-85-g430ab88ab1 I've made domaincaps
XML report supported TPM versions. This was done by calling
virTPMSwtpmSetupCapsGet(). But this function isn't mocked and
thus domaincapstest calls the real implementation, which tries to
execute swtpm_setup binary. This fails, because
virFindFileInPath() is mocked in such way that it returns NULL
for anything else than qemu-*.

Anyway, while the real binary is not executed after all, we
should mock the function which tries to execute it so that
predictable result is returned.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/testutilsqemu.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 6dabbaf36a..00dd9871d1 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -146,6 +146,24 @@ bool virTPMHasSwtpm(void)
 }
 
 
+bool
+virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap)
+{
+    switch (cap) {
+    case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_RECONFIGURE_PCR_BANKS:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_LAST:
+        break;
+    }
+
+    return false;
+}
+
+
 virCapsHostNUMA *
 virCapabilitiesHostNUMANewHost(void)
 {
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul 29 07:42:11 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri, 29 Jul 2022 09:42:11 +0200
Subject: [PATCH 1/3] virtpm: Use corresponding type for argument for
 virTPM*CapsGet()
In-Reply-To: <cover.1659080395.git.mprivozn@redhat.com>
References: <cover.1659080395.git.mprivozn@redhat.com>
Message-ID: <787c7fd4c4936c99737fd4ea4f40d1d9de3e501f.1659080395.git.mprivozn@redhat.com>

In virtpm.h there are two functions exposed for querying swtpm
and swtpm_setup capabilieis: virTPMSwtpmCapsGet() and
virTPMSwtpmSetupCapsGet(), respectively. The capabilities we are
interested in are defined in two separate enums
(virTPMSwtpmFeature and virTPMSwtpmSetupFeature), but these
functions accept capability as an unsigned int rather than their
respective enum. While this makes sense for
virTPMBinaryGetCaps(), which is a module internal helper that
both exposed functions call, there's no need for the functions
themselves to accept unsigned int.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/util/virtpm.c | 4 ++--
 src/util/virtpm.h | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/util/virtpm.c b/src/util/virtpm.c
index 3c961c11cb..2f2b061fee 100644
--- a/src/util/virtpm.c
+++ b/src/util/virtpm.c
@@ -345,13 +345,13 @@ virTPMBinaryGetCaps(virTPMBinary binary,
 }
 
 bool
-virTPMSwtpmCapsGet(unsigned int cap)
+virTPMSwtpmCapsGet(virTPMSwtpmFeature cap)
 {
     return virTPMBinaryGetCaps(VIR_TPM_BINARY_SWTPM, cap);
 }
 
 bool
-virTPMSwtpmSetupCapsGet(unsigned int cap)
+virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap)
 {
     return virTPMBinaryGetCaps(VIR_TPM_BINARY_SWTPM_SETUP, cap);
 }
diff --git a/src/util/virtpm.h b/src/util/virtpm.h
index 89adbdf720..a873881b23 100644
--- a/src/util/virtpm.h
+++ b/src/util/virtpm.h
@@ -28,9 +28,6 @@ char *virTPMGetSwtpmIoctl(void);
 
 bool virTPMHasSwtpm(void);
 
-bool virTPMSwtpmCapsGet(unsigned int cap);
-bool virTPMSwtpmSetupCapsGet(unsigned int cap);
-
 typedef enum {
     VIR_TPM_SWTPM_FEATURE_CMDARG_PWD_FD,
 
@@ -50,3 +47,6 @@ typedef enum {
 
 VIR_ENUM_DECL(virTPMSwtpmFeature);
 VIR_ENUM_DECL(virTPMSwtpmSetupFeature);
+
+bool virTPMSwtpmCapsGet(virTPMSwtpmFeature cap);
+bool virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap);
-- 
2.35.1


From mprivozn at redhat.com  Fri Jul 29 07:42:13 2022
From: mprivozn at redhat.com (Michal Privoznik)
Date: Fri, 29 Jul 2022 09:42:13 +0200
Subject: [PATCH 3/3] testutilsqemu: Fake TPM versions
In-Reply-To: <cover.1659080395.git.mprivozn@redhat.com>
References: <cover.1659080395.git.mprivozn@redhat.com>
Message-ID: <1833c56185a1c5d2c806c6f0268fbc4ee00d3b1f.1659080395.git.mprivozn@redhat.com>

Because of v8.5.0-rc1~25 we are already faking TPM support for
domaincaps. Might as well fake supported TPM versions.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_3.1.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_4.0.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_4.1.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_4.2.0.ppc64.xml        | 4 ++++
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml | 4 ++++
 tests/domaincapsdata/qemu_5.0.0.aarch64.xml      | 4 ++++
 tests/domaincapsdata/qemu_5.0.0.ppc64.xml        | 4 ++++
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml | 4 ++++
 tests/domaincapsdata/qemu_5.2.0.aarch64.xml      | 4 ++++
 tests/domaincapsdata/qemu_5.2.0.ppc64.xml        | 4 ++++
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml | 4 ++++
 tests/domaincapsdata/qemu_6.0.0.aarch64.xml      | 4 ++++
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml | 4 ++++
 tests/domaincapsdata/qemu_6.2.0.aarch64.xml      | 4 ++++
 tests/domaincapsdata/qemu_6.2.0.ppc64.xml        | 4 ++++
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml | 4 ++++
 tests/domaincapsdata/qemu_7.0.0.aarch64.xml      | 4 ++++
 tests/domaincapsdata/qemu_7.0.0.ppc64.xml        | 4 ++++
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml       | 4 ++++
 tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml   | 4 ++++
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml       | 4 ++++
 tests/testutilsqemu.c                            | 5 +++--
 52 files changed, 207 insertions(+), 2 deletions(-)

diff --git a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
index c4277c53a1..0d4bccdc68 100644
--- a/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
@@ -198,6 +198,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
index 2a65cb0ad9..5fffa7cc5b 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -217,6 +217,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
index 6e3ddda356..8de1a65cd7 100644
--- a/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0.x86_64.xml
@@ -198,6 +198,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
index 8f3911b4b3..e6c0a18711 100644
--- a/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
@@ -198,6 +198,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
index a4dc7bafc9..b7a5eb35af 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -217,6 +217,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
index 24e732d9c3..3d12aef002 100644
--- a/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0.x86_64.xml
@@ -198,6 +198,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
index 3ee7feea48..212ea2a288 100644
--- a/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
@@ -204,6 +204,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
index b20c02cb68..2fb0639f70 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -220,6 +220,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
index 0f1d398e2c..be001262ec 100644
--- a/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0.x86_64.xml
@@ -204,6 +204,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
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 c8a77cdd41..a4ddb1de4d 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -212,6 +212,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
index d0ee3f7b7a..59efd9424c 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -227,6 +227,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
index 4c3a2c6d98..ed8866cfe5 100644
--- a/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.ppc64.xml
@@ -132,6 +132,10 @@
         <value>spapr-tpm-proxy</value>
       </enum>
       <enum name='backendModel'/>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
index 6578fd04b6..0cfed39048 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -212,6 +212,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
index 8a6797c2f1..ee77808566 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -214,6 +214,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
index d277c96426..fb428690d5 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -229,6 +229,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
index f8cea230d9..339c839168 100644
--- a/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-virt.aarch64.xml
@@ -173,6 +173,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
index ab72b7ffeb..169f347439 100644
--- a/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.aarch64.xml
@@ -171,6 +171,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
index d196676b14..b02b66a674 100644
--- a/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.ppc64.xml
@@ -138,6 +138,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
index 51ca1d98e0..f560826fed 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -214,6 +214,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
index 3468fb2e72..9b20589278 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -215,6 +215,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
index 4f1ffbb2ba..fbc7716675 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -229,6 +229,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
index 8ff49c7899..5e84d521af 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -215,6 +215,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
index 2301a475eb..bfb4ec38f2 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -215,6 +215,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
index 6cff0f815e..03fa802a7b 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -229,6 +229,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
index a863a6052d..6b21218f7f 100644
--- a/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-virt.aarch64.xml
@@ -173,6 +173,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
index ab72b7ffeb..169f347439 100644
--- a/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.aarch64.xml
@@ -171,6 +171,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
index b2c0577be9..50065d1a9b 100644
--- a/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.ppc64.xml
@@ -138,6 +138,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
index 41a54985d7..a37b9930be 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -215,6 +215,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
index 4595e70f61..40df34edf0 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -216,6 +216,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
index 65f4459bcb..e563b0cb59 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -230,6 +230,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
index 61eab9de0e..958c40437f 100644
--- a/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-virt.aarch64.xml
@@ -174,6 +174,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
index fa722b5fd3..4164bf49f7 100644
--- a/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.aarch64.xml
@@ -172,6 +172,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
index a6fa374211..eb60a2105f 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -216,6 +216,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
index f4d0fcf673..0480a086c6 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -217,6 +217,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
index 40bc875e3c..7baecb0c73 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -230,6 +230,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
index 67fc449f5d..9cbe93ad46 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -217,6 +217,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
index 9d68c0a404..07b951b81f 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -217,6 +217,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
index a439dda190..367e656b31 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -231,6 +231,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
index f6045623f5..99c0fc03fd 100644
--- a/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-virt.aarch64.xml
@@ -176,6 +176,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
index 35e18adcd5..8e04508694 100644
--- a/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.aarch64.xml
@@ -174,6 +174,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
index b07072778b..0bbe501383 100644
--- a/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.ppc64.xml
@@ -136,6 +136,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
index 0f89790b60..f363cf1b79 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -217,6 +217,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
index 4e6ff06125..d8937f0443 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -219,6 +219,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
index ed80a7892f..0e557e715b 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -233,6 +233,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
index 7a8cb9f113..096c8087bf 100644
--- a/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-virt.aarch64.xml
@@ -176,6 +176,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
index d48c87dc3a..a67b6d014e 100644
--- a/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.aarch64.xml
@@ -174,6 +174,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
index ec171bcdd9..12cf2c9b0b 100644
--- a/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.ppc64.xml
@@ -138,6 +138,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
index a20395c6d4..03e456f8e9 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -219,6 +219,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
index 4e96c5104a..3b1911e0c5 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -218,6 +218,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
index 46542c8b5b..027ca34a16 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -231,6 +231,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
index 02b43e318f..edd8cf8729 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -218,6 +218,10 @@
         <value>passthrough</value>
         <value>emulator</value>
       </enum>
+      <enum name='backendVersion'>
+        <value>1.2</value>
+        <value>2.0</value>
+      </enum>
     </tpm>
   </devices>
   <features>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 00dd9871d1..7a447bb5f0 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -150,12 +150,13 @@ bool
 virTPMSwtpmSetupCapsGet(virTPMSwtpmSetupFeature cap)
 {
     switch (cap) {
+    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2:
+    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0:
+        return true;
     case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_PWDFILE_FD:
     case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_CREATE_CONFIG_FILES:
     case VIR_TPM_SWTPM_SETUP_FEATURE_TPM12_NOT_NEED_ROOT:
     case VIR_TPM_SWTPM_SETUP_FEATURE_CMDARG_RECONFIGURE_PCR_BANKS:
-    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_1_2:
-    case VIR_TPM_SWTPM_SETUP_FEATURE_TPM_2_0:
     case VIR_TPM_SWTPM_SETUP_FEATURE_LAST:
         break;
     }
-- 
2.35.1


From jdenemar at redhat.com  Fri Jul 29 08:14:22 2022
From: jdenemar at redhat.com (Jiri Denemark)
Date: Fri, 29 Jul 2022 10:14:22 +0200 (CEST)
Subject: libvirt-8.6.0 release candidate 2
In-Reply-To: <20220726091216.DD4BA180147@rein.int.mamuti.net>
Message-ID: <20220729081422.D2A3518B1B9@rein.int.mamuti.net>

I have just tagged v8.6.0-rc2 in the repository and pushed signed
tarballs and source RPMs to https://libvirt.org/sources/

Please give the release candidate some testing and in case you find a
serious issue which should have a fix in the upcoming release, feel
free to reply to this thread to make sure the issue is more visible.

If you have not done so yet, please update NEWS.rst to document any
significant change you made since the last release.

Thanks,

Jirka

From cbouchar at redhat.com  Thu Jul 28 18:14:30 2022
From: cbouchar at redhat.com (Carol Bouchard)
Date: Thu, 28 Jul 2022 14:14:30 -0400
Subject: Can RHEL7 VM run remote libvirt commands to Fedora36 host?
Message-ID: <CACkzpE4Lou0_O4aLtoNyDpgZHgxmyNC+q2-JdbE5byfvrHoctQ@mail.gmail.com>

I have a test environment that use to work but no longer does. My
laptop is Fedora36 (libvirt version 8.1.0.2) while the VMs it spawns are
RHEL7 (max libvirt version is 4.5.0). The source of my problem
seems to be that RHEL7 libvirt needs rw socket /var/run/libvirt/libvirt-sock
which no longer exists in fedora36.

The following is successful from RHEL7 VM to laptop:
virsh -d0 --connect
'qemu+ssh://192.168.120.1/system?*socket*=/var/run/libvirt/libvirt-sock-ro'
domstate beaker-test-vm1.beaker

If I change the action from domstate to start, it fails on
error: Failed to start domain beaker-test-vm1.beaker
error: operation forbidden: read only access prevents virDomainCreate
which made me realize ro stands for read-only; however, there is no
libvirt-sock. I tried some of the other socket files without success.
Is there a work-around?

Carol
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20220728/e3b7d0b7/attachment.htm>

From pkrempa at redhat.com  Fri Jul 29 11:17:18 2022
From: pkrempa at redhat.com (Peter Krempa)
Date: Fri, 29 Jul 2022 13:17:18 +0200
Subject: [PATCH v14 11/15] conf: Introduce SGX EPC element into device
 memory xml
In-Reply-To: <b420073d-8923-4c97-03f4-1550be303d8c@redhat.com>
References: <cover.1658917570.git.mprivozn@redhat.com>
 <d692188ec7f4ef9c4b90d73a4263c4214b8f433d.1658917570.git.mprivozn@redhat.com>
 <YuKD3c3+zd4jlCCc@angien.pipo.sk>
 <b420073d-8923-4c97-03f4-1550be303d8c@redhat.com>
Message-ID: <YuPBvlHUQVKcSBJk@angien.pipo.sk>

On Fri, Jul 29, 2022 at 09:38:35 +0200, Michal Pr?vozn?k wrote:
> On 7/28/22 14:41, Peter Krempa wrote:
> > On Wed, Jul 27, 2022 at 12:34:57 +0200, Michal Privoznik wrote:
> >> From: Lin Yang <lin.a.yang at intel.com>
> >>
> >> With NUMA config:
> >>
> >> <devices>
> >>   ...
> >>   <memory model='sgx-epc'>
> >>     <source>
> >>       <nodemask>0-1</nodemask>
> >>     </source>
> >>     <target>
> >>       <size unit='KiB'>512</size>
> >>       <node>0</node>
> >>     </target>
> >>   </memory>
> >>   ...
> >> </devices>
> >>
> >> Without NUMA config:
> >>
> >> <devices>
> >>   ...
> >>   <memory model='sgx-epc'>
> >>     <target>
> >>       <size unit='KiB'>512</size>
> >>     </target>
> >>   </memory>
> >>   ...
> >> </devices>
> >>
> >> Signed-off-by: Lin Yang <lin.a.yang at intel.com>
> >> Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
> >> ---
> > 
> > [...]
> > 
> >> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
> >> index 1ed969ac3e..bdd0fcea8e 100644
> >> --- a/docs/formatdomain.rst
> >> +++ b/docs/formatdomain.rst
> >> @@ -7940,6 +7940,20 @@ Example: usage of the memory devices
> >>           <current unit='KiB'>524288</current>
> >>         </target>
> >>       </memory>
> >> +     <memory model='sgx-epc'>
> >> +       <source>
> >> +         <nodemask>0-1</nodemask>
> >> +       </source>
> >> +       <target>
> >> +         <size unit='KiB'>16384</size>
> >> +         <node>0</node>
> >> +       </target>
> >> +     </memory>
> >> +     <memory model='sgx-epc'>
> >> +       <target>
> >> +         <size unit='KiB'>16384</size>
> >> +       </target>
> >> +     </memory>
> >>     </devices>
> >>     ...
> >>  
> >> @@ -7948,7 +7962,9 @@ Example: usage of the memory devices
> >>     1.2.14` Provide ``nvdimm`` model that adds a Non-Volatile DIMM module.
> >>     :since:`Since 3.2.0` Provide ``virtio-pmem`` model to add a paravirtualized
> >>     persistent memory device. :since:`Since 7.1.0` Provide ``virtio-mem`` model
> >> -   to add paravirtualized memory device. :since:`Since 7.9.0`
> >> +   to add paravirtualized memory device. :since:`Since 7.9.0` Provide
> >> +   ``sgx-epc`` model to add a SGX enclave page cache (EPC) memory to the guest.
> >> +   :since:`Since 8.7.0 and QEMU 6.2.0`
> > 
> > I don't quite understand from this description whether this is real
> > memory usable by the guest OS or something for internal use by the
> > hypervisor.
> > 
> > Specifically which leads me to questioning this is that the example
> > sizes are very tiny compared to real memory sizing.
> 
> I admit that I don't know all the details and let somebody from Intel to
> provide them. But basically, SGX works by reserving a chunk of RAM (on
> each NUMA node) which is then encrypted and the processor controls
> access to it. This chunk is referred to as Processor Reserved Memory and
> to my understanding is the maximum size of an enclave. Thus I can
> understand why new <memory/> model was used.

Even this interpretation would not sit well with the semantics of the
<memory> element.

> But I'm not sure how QEMU
> accounts for this memory, whether say 16KiB worth of SGX is added to
> whatever current guest has OR it's taken from an existing memory.

Note that the name expands to "enclave page cache", so even the name
doesn't really seem to be hinting that the memory declared like this is
used by the guest OS.

Preferrably the documentation added in this patch will clarify that,
because if it is not clarified by the documentation, we will be getting
clarification requests and it's very apparent that we can't answer them
since neither of us actually knows what's going on.

> 
> > 
> > Additionally in qemuDomainDefValidateMemoryHotplug you are changing the
> > code to specifically exclude the sizing of the 'sgx-epc' memory devices
> > from the total size of the memory, but this contrasts with the memory
> > _not_ being excluded from the initial memory calculation in
> > virDomainDefGetMemoryInitial which is used to format the initial memory
> > argument ('-m size=...'). Thus at least one of them is wrong.
> > 
> > If this is not guest usable memory, then the <memory> element should not
> > be used to bolt this on, but rather add a new element similarly to what
> > we have when AMD SEV is in use.
> > 
> 
> Alright, I'm hold off reworking these patches per your review until we
> are clear on this.
> 
> Michal
> 

From abologna at redhat.com  Fri Jul 29 13:47:53 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Fri, 29 Jul 2022 06:47:53 -0700
Subject: [libvirt PATCH 1/2] conf: support stateless UEFI firmware
In-Reply-To: <20220722162317.2377173-2-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
 <20220722162317.2377173-2-berrange@redhat.com>
Message-ID: <CABJz62Payz0uE1tzHc=3wM-V4T3k5WBMN_3pAfgYSgGVrw2hjg@mail.gmail.com>

Apologies for this feedback coming very late - not just post-merge
but also extremely close to release.

On Fri, Jul 22, 2022 at 05:23:16PM +0100, Daniel P. Berrang? wrote:
> diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
> index 3ea094e64c..4199abfd1a 100644
> --- a/docs/formatdomain.rst
> +++ b/docs/formatdomain.rst
> @@ -242,7 +242,11 @@ harddisk, cdrom, network) determining where to obtain/find the boot image.
>     firmwares may implement the Secure boot feature. Attribute ``secure`` can be
>     used to tell the hypervisor that the firmware is capable of Secure Boot feature.
>     It cannot be used to enable or disable the feature itself in the firmware.
> -   :since:`Since 2.1.0`
> +   :since:`Since 2.1.0`. If the loader is marked as read-only, then with UEFI it
> +   is assumed that there will be a writable NVRAM available. In some cases,
> +   however, it may be desirable for the loader to run without any NVRAM, discarding
> +   any config changes on shutdown. The ``stateless`` flag can be used to control
> +   this behaviour, when set to ``no`` NVRAM will never be created.

Isn't the actual behavior the opposite of what you're describing
here? That is, stateless=yes is what causes the NVRAM file to not be
created.

> +++ b/src/conf/domain_validate.c
> @@ -1672,6 +1672,32 @@ virDomainDefOSValidate(const virDomainDef *def,
>          }
>      }
>
> +    if (loader->stateless == VIR_TRISTATE_BOOL_YES) {
> +        if (loader->nvramTemplate) {
> +            virReportError(VIR_ERR_XML_DETAIL, "%s",
> +                           _("NVRAM template is not permitted when loader is stateless"));
> +            return -1;
> +        }
> +
> +        if (loader->nvram) {
> +            virReportError(VIR_ERR_XML_DETAIL, "%s",
> +                           _("NVRAM is not permitted when loader is stateless"));
> +            return -1;
> +        }
> +    } else if (loader->stateless == VIR_TRISTATE_BOOL_NO) {
> +        if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) {
> +            if (def->os.loader->type != VIR_DOMAIN_LOADER_TYPE_PFLASH) {
> +                virReportError(VIR_ERR_XML_DETAIL, "%s",
> +                               _("Only pflash loader type permits NVRAM"));
> +                return -1;
> +            }
> +        } else if (def->os.firmware != VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
> +            virReportError(VIR_ERR_XML_DETAIL, "%s",
> +                           _("Only EFI firmware permits NVRAM"));
> +            return -1;
> +        }

These last two error messages could be improved IMO.

Consider the firmware-auto-bios-not-stateless test case, where the
input configuration looks like

  <os firmware='bios'>
    <type arch='x86_64' machine='pc-q35-4.0'>hvm</type>
    <loader stateless='no'/>
  </os>

In this case, printing out

  Only EFI firmware permits NVRAM

is a bit confusing, since the user has not directly mentioned NVRAM
anywhere. Something along the lines of

  virReportError(VIR_ERR_XML_DETAIL,
                 _("Firmware type '%s' only supports stateless operations"),
                 virDomainOsDefFirmwareTypeToString(def->os.firmware));

would be more understandable and actionable, I think.

-- 
Andrea Bolognani / Red Hat / Virtualization


From abologna at redhat.com  Fri Jul 29 13:48:02 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Fri, 29 Jul 2022 06:48:02 -0700
Subject: [libvirt PATCH 2/2] qemu: support use of stateless EFI firmware
In-Reply-To: <20220722162317.2377173-3-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
 <20220722162317.2377173-3-berrange@redhat.com>
Message-ID: <CABJz62OsYdRVdEmO93pt+8Ym-tzL8cTpMgA15NcxJ9+5k1Sk6w@mail.gmail.com>

On Fri, Jul 22, 2022 at 05:23:17PM +0100, Daniel P. Berrang? wrote:
>          VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'",
>                    def->os.loader->path,
> -                  def->os.loader->nvramTemplate,
> -                  def->os.loader->nvram->path);
> +                  NULLSTR(def->os.loader->nvramTemplate),
> +                  NULLSTR(def->os.loader->nvram ? def->os.loader->nvram->path : NULL));

It would be nice to reflect in the live XML whether or not a
stateless firmware has been picked. Something along the lines of the
hastily thrown together, very lightly tested diff below should do the
trick.


diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
index eb7abb0b32..68d562285e 100644
--- a/src/qemu/qemu_firmware.c
+++ b/src/qemu/qemu_firmware.c
@@ -1200,6 +1200,9 @@ qemuFirmwareEnableFeatures(virQEMUDriver *driver,
                 def->os.loader->nvram->format = VIR_STORAGE_FILE_RAW;
                 qemuDomainNVRAMPathFormat(cfg, def,
&def->os.loader->nvram->path);
             }
+            def->os.loader->stateless = VIR_TRISTATE_BOOL_NO;
+        } else if (flash->mode == QEMU_FIRMWARE_FLASH_MODE_STATELESS) {
+            def->os.loader->stateless = VIR_TRISTATE_BOOL_YES;
         }

         VIR_DEBUG("decided on firmware '%s' template '%s' NVRAM '%s'",
-- 
Andrea Bolognani / Red Hat / Virtualization


From abologna at redhat.com  Fri Jul 29 13:48:33 2022
From: abologna at redhat.com (Andrea Bolognani)
Date: Fri, 29 Jul 2022 06:48:33 -0700
Subject: [libvirt PATCH 0/2] qemu: support stateless UEFI firmware
In-Reply-To: <20220722162317.2377173-1-berrange@redhat.com>
References: <20220722162317.2377173-1-berrange@redhat.com>
Message-ID: <CABJz62OBnoF1a-QKiwo-Gydt5taRi8fakw9aay_hYP1o7udtdg@mail.gmail.com>

On Fri, Jul 22, 2022 at 05:23:15PM +0100, Daniel P. Berrang? wrote:
> This is to enable SEV builds of UEFI which provide only a single CODE.fd
> file, with not VARS.fd.

This is a significant enough user-visible change that a NEWS entry
for it would be warranted.

-- 
Andrea Bolognani / Red Hat / Virtualization


From olekstysh at gmail.com  Fri Jul 29 15:50:24 2022
From: olekstysh at gmail.com (Oleksandr Tyshchenko)
Date: Fri, 29 Jul 2022 18:50:24 +0300
Subject: [libvirt PATCH] libxl: Fix build with recent Xen that introduces new
 disk backend type
Message-ID: <20220729155024.3327364-1-olekstysh@gmail.com>

From: Oleksandr Tyshchenko <oleksandr_tyshchenko at epam.com>

Xen toolstack has gained basic Virtio support recently which becides
adding various virtio related stuff introduces new disk backend type
LIBXL_DISK_BACKEND_STANDALONE [1].

Unfortunately, this caused a regression in libvirt build with Xen support
enabled, reported by the osstest today [2]:

CC       libxl/libvirt_driver_libxl_impl_la-xen_xl.lo
../../src/libxl/xen_xl.c: In function 'xenParseXLDisk':
../../src/libxl/xen_xl.c:779:17: error: enumeration value 'LIBXL_DISK_BACKEND_STANDALONE'
   not handled in switch [-Werror=switch-enum]
                 switch (libxldisk->backend) {
                 ^~~~~~
cc1: all warnings being treated as errors

The interesting fact is that switch already has a default branch (which ought
to cover such new addition), but the error is triggered as -Wswitch-enum
gives a warning about an omitted enumeration code even if there is a default
label.

Also there is a similar issue in libxlUpdateDiskDef() which I have reproduced
after fixing the first one, but it that case the corresponding switch doesn't
have a default branch.

Fix both issues by inserting required enumeration item to make the compiler
happy and adding ifdef guard to be able to build against old Xen libraries
as well (without LIBXL_HAVE_DEVICE_DISK_SPECIFICATION). Also add a default
branch to switch in libxlUpdateDiskDef().

Please note, that current patch doesn't implement the proper handling of
LIBXL_DISK_BACKEND_STANDALONE and friends, it is just intended to fix
the regression immediately to unblock the osstest.  Also it worth mentioning
that current patch won't solve the possible additions in the future.

[1] https://lore.kernel.org/xen-devel/20220716163745.28712-1-olekstysh at gmail.com/
[2] https://lore.kernel.org/xen-devel/E1oHEQO-0008GA-Uo at osstest.test-lab.xenproject.org/

Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko at epam.com>
---
Cc: Julien Grall <julien at xen.org>
Cc: Anthony PERARD <anthony.perard at citrix.com>
Cc: Michal Privoznik <mprivozn at redhat.com>

Please note, the patch is tested on:
https://xenbits.xen.org/gitweb/?p=libvirt.git;a=shortlog;h=refs/heads/xen-tested-master
but should work on the master as well (as the same code is present here).
---
 src/libxl/libxl_conf.c | 4 ++++
 src/libxl/xen_xl.c     | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index aa3d7925ec..526f0b2b08 100644
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1240,6 +1240,10 @@ libxlUpdateDiskDef(virDomainDiskDef *l_disk, libxl_device_disk *x_disk)
         driver = "phy";
         break;
     case LIBXL_DISK_BACKEND_UNKNOWN:
+#ifdef LIBXL_HAVE_DEVICE_DISK_SPECIFICATION
+    case LIBXL_DISK_BACKEND_STANDALONE:
+#endif
+    default:
         break;
     }
     if (driver)
diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 4de4e3140f..6919325623 100644
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -715,6 +715,9 @@ xenParseXLDisk(virConf *conf, virDomainDef *def)
                     virDomainDiskSetDriver(disk, "phy");
                     virDomainDiskSetType(disk, VIR_STORAGE_TYPE_BLOCK);
                     break;
+#ifdef LIBXL_HAVE_DEVICE_DISK_SPECIFICATION
+                case LIBXL_DISK_BACKEND_STANDALONE:
+#endif
                 default:
                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                                    _("disk backend not supported: %s"),
-- 
2.25.1


From jfehlig at suse.com  Fri Jul 29 19:34:32 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Fri, 29 Jul 2022 13:34:32 -0600
Subject: [PATCH V2 0/4] Handle physical address bits
Message-ID: <20220729193436.15575-1-jfehlig@suse.com>

Hi All,

This is a V2 of Dario's old patches adding support for specifying the
virtual CPU address size in bits

https://listman.redhat.com/archives/libvir-list/2020-October/210901.html

I've rebased those patches to latest master and tweaked them a bit. E.g.
I removed the qemucaps code since phys-bits and host-phys-bits have been
around before the minimum qemu version supported by libvirt. I also added
patches to expose the number of host address bits and ensure ABI stability
as requested in the old review comments.

Dario Faggioli (2):
  conf: Add support for specifying CPU max physical address size
  qemu: Add support for max physical address size

Jim Fehlig (2):
  capabilities: Report number of host CPU physical address bits
  cpu conf: Check ABI stability of CPU maxphysaddr config

 docs/formatdomain.rst                         | 23 +++++++
 src/conf/cpu_conf.c                           | 63 +++++++++++++++++++
 src/conf/cpu_conf.h                           | 17 +++++
 src/conf/schemas/cputypes.rng                 | 19 ++++++
 src/cpu/cpu_x86.c                             |  8 +++
 src/libvirt_private.syms                      |  2 +
 src/qemu/qemu_command.c                       | 21 +++++++
 src/qemu/qemu_domain.c                        | 46 ++++++++++++++
 src/qemu/qemu_validate.c                      | 12 ++++
 src/util/virhostcpu.c                         | 55 ++++++++++++++++
 src/util/virhostcpu.h                         |  3 +
 .../cpu-phys-bits-emulate.xml                 | 20 ++++++
 .../cpu-phys-bits-passthrough.xml             | 20 ++++++
 tests/genericxml2xmltest.c                    |  3 +
 .../cpu-phys-bits-emulate.args                | 32 ++++++++++
 .../cpu-phys-bits-emulate.xml                 | 20 ++++++
 .../cpu-phys-bits-emulate2.args               | 32 ++++++++++
 .../cpu-phys-bits-emulate2.xml                | 20 ++++++
 .../cpu-phys-bits-emulate3.err                |  1 +
 .../cpu-phys-bits-emulate3.xml                | 20 ++++++
 .../cpu-phys-bits-passthrough.args            | 32 ++++++++++
 .../cpu-phys-bits-passthrough.xml             | 20 ++++++
 .../cpu-phys-bits-passthrough2.err            |  1 +
 .../cpu-phys-bits-passthrough2.xml            | 20 ++++++
 .../cpu-phys-bits-passthrough3.err            |  1 +
 .../cpu-phys-bits-passthrough3.xml            | 20 ++++++
 tests/qemuxml2argvtest.c                      |  7 +++
 27 files changed, 538 insertions(+)
 create mode 100644 tests/genericxml2xmlindata/cpu-phys-bits-emulate.xml
 create mode 100644 tests/genericxml2xmlindata/cpu-phys-bits-passthrough.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml

-- 
2.36.1


From jfehlig at suse.com  Fri Jul 29 19:34:33 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Fri, 29 Jul 2022 13:34:33 -0600
Subject: [PATCH V2 1/4] conf: Add support for specifying CPU max physical
 address size
In-Reply-To: <20220729193436.15575-1-jfehlig@suse.com>
References: <20220729193436.15575-1-jfehlig@suse.com>
Message-ID: <20220729193436.15575-2-jfehlig@suse.com>

From: Dario Faggioli <dfaggioli at suse.com>

This patch introduces the

    <maxphysaddr mode='passthrough'/>
    <maxphysaddr mode='emulate' bits='42'/>

sub element of /domain/cpu, which allows specifying the guest virtual CPU
address size. This can be useful if the guest needs to have a large amount
of memory.

If mode='passthrough', the virtual CPU will have the same number of address
bits as the host. If mode='emulate', the mandatory bits attribute specifies
the number of address bits.

Signed-off-by: Dario Faggioli <dfaggioli at suse.com>
Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 docs/formatdomain.rst                         | 23 ++++++++
 src/conf/cpu_conf.c                           | 54 +++++++++++++++++++
 src/conf/cpu_conf.h                           | 17 ++++++
 src/conf/schemas/cputypes.rng                 | 19 +++++++
 src/libvirt_private.syms                      |  2 +
 .../cpu-phys-bits-emulate.xml                 | 20 +++++++
 .../cpu-phys-bits-passthrough.xml             | 20 +++++++
 tests/genericxml2xmltest.c                    |  3 ++
 8 files changed, 158 insertions(+)

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index 1ed969ac3e..adfdd7b7a5 100644
--- a/docs/formatdomain.rst
+++ b/docs/formatdomain.rst
@@ -1336,6 +1336,7 @@ following collection of elements. :since:`Since 0.7.5`
      <vendor>Intel</vendor>
      <topology sockets='1' dies='1' cores='2' threads='1'/>
      <cache level='3' mode='emulate'/>
+     <maxphysaddr mode='emulate' bits='42'>
      <feature policy='disable' name='lahf_lm'/>
    </cpu>
    ...
@@ -1352,6 +1353,7 @@ following collection of elements. :since:`Since 0.7.5`
 
    <cpu mode='host-passthrough' migratable='off'>
      <cache mode='passthrough'/>
+     <maxphysaddr mode='passthrough'>
      <feature policy='disable' name='lahf_lm'/>
    ...
 
@@ -1600,6 +1602,27 @@ In case no restrictions need to be put on CPU model and its features, a simpler
          The virtual CPU will report no CPU cache of the specified level (or no
          cache at all if the ``level`` attribute is missing).
 
+``maxphysaddr``
+   :since:`Since 8.7.0` the ``maxphysaddr`` element describes the virtual CPU
+   address size in bits. The hypervisor default is used if the element is missing.
+
+   ``mode``
+      This mandatory attribute specifies how the address size is presented. The
+      follow modes are supported:
+
+      ``passthrough``
+         The number of physical address bits reported by the host CPU will be
+         passed through to the virtual CPUs
+      ``emulate``
+         The hypervisor will define a specific value for the number of bits
+         of physical addresses via the ``bits`` attribute, which is mandatory.
+	 The number of bits cannot exceed the number of physical address bits
+	 supported by the hypervisor.
+
+   ``bits``
+      The ``bits`` attribute is mandatory if the ``mode`` attribute is set to
+      ``emulate`` and specifies the virtual CPU address size in bits.
+
 Guest NUMA topology can be specified using the ``numa`` element. :since:`Since
 0.9.8`
 
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 8d80bbd842..e31c4ab467 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -82,6 +82,12 @@ VIR_ENUM_IMPL(virCPUCacheMode,
               "disable",
 );
 
+VIR_ENUM_IMPL(virCPUMaxPhysAddrMode,
+              VIR_CPU_MAX_PHYS_ADDR_MODE_LAST,
+              "emulate",
+              "passthrough",
+);
+
 
 virCPUDef *virCPUDefNew(void)
 {
@@ -127,6 +133,7 @@ virCPUDefFree(virCPUDef *def)
     if (g_atomic_int_dec_and_test(&def->refs)) {
         virCPUDefFreeModel(def);
         g_free(def->cache);
+        g_free(def->addr);
         g_free(def->tsc);
         g_free(def);
     }
@@ -252,6 +259,11 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
         *copy->cache = *cpu->cache;
     }
 
+    if (cpu->addr) {
+        copy->addr = g_new0(virCPUMaxPhysAddrDef, 1);
+        *copy->addr = *cpu->addr;
+    }
+
     if (cpu->tsc) {
         copy->tsc = g_new0(virHostCPUTscInfo, 1);
         *copy->tsc = *cpu->tsc;
@@ -644,6 +656,39 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
         def->cache->mode = mode;
     }
 
+    if (virXPathInt("count(./maxphysaddr)", ctxt, &n) < 0) {
+        return -1;
+    } else if (n > 1) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("at most one CPU maximum physical address bits "
+                         "element may be specified"));
+        return -1;
+    } else if (n == 1) {
+        g_autofree char *strmode = NULL;
+        int mode;
+        int bits = -1;
+
+        if (!(strmode = virXPathString("string(./maxphysaddr[1]/@mode)", ctxt)) ||
+            (mode = virCPUMaxPhysAddrModeTypeFromString(strmode)) < 0) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("missing or invalid CPU maximum physical "
+                             "address bits mode"));
+            return -1;
+        }
+
+        if (virXPathBoolean("boolean(./maxphysaddr[1]/@bits)", ctxt) == 1 &&
+            (virXPathInt("string(./maxphysaddr[1]/@bits)", ctxt, &bits) < 0 ||
+             bits < 0)) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("CPU maximum physical address bits < 0"));
+            return -1;
+        }
+
+        def->addr = g_new0(virCPUMaxPhysAddrDef, 1);
+        def->addr->bits = bits;
+        def->addr->mode = mode;
+    }
+
     *cpu = g_steal_pointer(&def);
     return 0;
 }
@@ -811,6 +856,15 @@ virCPUDefFormatBuf(virBuffer *buf,
         virBufferAddLit(buf, "/>\n");
     }
 
+    if (def->addr) {
+        virBufferAddLit(buf, "<maxphysaddr ");
+        virBufferAsprintf(buf, "mode='%s'",
+                          virCPUMaxPhysAddrModeTypeToString(def->addr->mode));
+        if (def->addr->bits != -1)
+            virBufferAsprintf(buf, " bits='%d'", def->addr->bits);
+        virBufferAddLit(buf, "/>\n");
+    }
+
     for (i = 0; i < def->nfeatures; i++) {
         virCPUFeatureDef *feature = def->features + i;
 
diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 5d2980edbd..113d349708 100644
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -116,6 +116,22 @@ struct _virCPUCacheDef {
 };
 
 
+typedef enum {
+    VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE,
+    VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH,
+
+    VIR_CPU_MAX_PHYS_ADDR_MODE_LAST
+} virCPUMaxPhysAddrMode;
+
+VIR_ENUM_DECL(virCPUMaxPhysAddrMode);
+
+typedef struct _virCPUMaxPhysAddrDef virCPUMaxPhysAddrDef;
+struct _virCPUMaxPhysAddrDef {
+    int bits;           /* -1 for unspecified */
+    virCPUMaxPhysAddrMode mode;
+};
+
+
 typedef struct _virCPUDef virCPUDef;
 struct _virCPUDef {
     int refs;
@@ -140,6 +156,7 @@ struct _virCPUDef {
     size_t nfeatures_max;
     virCPUFeatureDef *features;
     virCPUCacheDef *cache;
+    virCPUMaxPhysAddrDef *addr;
     virHostCPUTscInfo *tsc;
     virTristateSwitch migratable; /* for host-passthrough mode */
 };
diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
index 122880fb2e..4ae386c3c0 100644
--- a/src/conf/schemas/cputypes.rng
+++ b/src/conf/schemas/cputypes.rng
@@ -305,6 +305,22 @@
     </element>
   </define>
 
+  <define name="cpuMaxPhysAddr">
+    <element name="maxphysaddr">
+      <attribute name="mode">
+        <choice>
+          <value>emulate</value>
+          <value>passthrough</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="bits">
+          <ref name="unsignedInt"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+
   <define name="hostcpu">
     <element name="cpu">
       <element name="arch">
@@ -432,6 +448,9 @@
         <optional>
           <ref name="cpuCache"/>
         </optional>
+        <optional>
+          <ref name="cpuMaxPhysAddr"/>
+        </optional>
       </interleave>
     </element>
   </define>
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6a5c5600df..774a594983 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -120,6 +120,8 @@ virCPUDefParseXMLString;
 virCPUDefRef;
 virCPUDefStealModel;
 virCPUDefUpdateFeature;
+virCPUMaxPhysAddrModeTypeFromString;
+virCPUMaxPhysAddrModeTypeToString;
 virCPUModeTypeToString;
 
 
diff --git a/tests/genericxml2xmlindata/cpu-phys-bits-emulate.xml b/tests/genericxml2xmlindata/cpu-phys-bits-emulate.xml
new file mode 100644
index 0000000000..e463e0b3e0
--- /dev/null
+++ b/tests/genericxml2xmlindata/cpu-phys-bits-emulate.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</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>
+  <cpu mode='host-passthrough'>
+    <maxphysaddr mode='emulate' bits='42'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/genericxml2xmlindata/cpu-phys-bits-passthrough.xml b/tests/genericxml2xmlindata/cpu-phys-bits-passthrough.xml
new file mode 100644
index 0000000000..cce676eaa6
--- /dev/null
+++ b/tests/genericxml2xmlindata/cpu-phys-bits-passthrough.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</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>
+  <cpu mode='host-passthrough'>
+    <maxphysaddr mode='passthrough'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/genericxml2xmltest.c b/tests/genericxml2xmltest.c
index b83367cb4b..bbe0d02226 100644
--- a/tests/genericxml2xmltest.c
+++ b/tests/genericxml2xmltest.c
@@ -246,6 +246,9 @@ mymain(void)
 
     DO_TEST_BACKUP_FULL("backup-pull-internal-invalid", true);
 
+    DO_TEST("cpu-phys-bits-emulate");
+    DO_TEST("cpu-phys-bits-passthrough");
+
 
     virObjectUnref(caps);
     virObjectUnref(xmlopt);
-- 
2.36.1


From jfehlig at suse.com  Fri Jul 29 19:34:34 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Fri, 29 Jul 2022 13:34:34 -0600
Subject: [PATCH V2 2/4] capabilities: Report number of host CPU physical
 address bits
In-Reply-To: <20220729193436.15575-1-jfehlig@suse.com>
References: <20220729193436.15575-1-jfehlig@suse.com>
Message-ID: <20220729193436.15575-3-jfehlig@suse.com>

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 src/cpu/cpu_x86.c     |  8 +++++++
 src/util/virhostcpu.c | 55 +++++++++++++++++++++++++++++++++++++++++++
 src/util/virhostcpu.h |  3 +++
 3 files changed, 66 insertions(+)

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 4bb2ea4bae..9fcd6b8add 100644
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2738,6 +2738,7 @@ virCPUx86GetHost(virCPUDef *cpu,
                  virDomainCapsCPUModels *models)
 {
     g_autoptr(virCPUData) cpuData = NULL;
+    unsigned int addrsz;
     int ret;
 
     if (virCPUx86DriverInitialize() < 0)
@@ -2784,6 +2785,13 @@ virCPUx86GetHost(virCPUDef *cpu,
         VIR_DEBUG("Host CPU does not support invariant TSC");
     }
 
+    if (virHostCPUGetPhysAddrSize(&addrsz) == 0) {
+        virCPUMaxPhysAddrDef *addr = g_new0(virCPUMaxPhysAddrDef, 1);
+
+        addr->bits = addrsz;
+        cpu->addr = addr;
+    }
+
     return ret;
 }
 #endif
diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
index 639dd9b51e..668e468f2a 100644
--- a/src/util/virhostcpu.c
+++ b/src/util/virhostcpu.c
@@ -570,6 +570,41 @@ virHostCPUParseFrequency(FILE *cpuinfo,
 }
 
 
+static int
+virHostCPUParsePhysAddrSize(FILE *cpuinfo, unsigned int *addrsz)
+{
+    char line[1024];
+
+    while (fgets(line, sizeof(line), cpuinfo) != NULL) {
+        char *str;
+        char *endptr;
+
+        if (!STRPREFIX(line, "address sizes"))
+            continue;
+
+        str = line;
+        str += strlen("address sizes");
+
+        /* Skip the colon. */
+        if ((str = strstr(str, ":")) == NULL)
+            goto error;
+        str++;
+
+        /* Parse the number of physical address bits */
+        if (virStrToLong_ui(str, &endptr, 10, addrsz) < 0)
+            goto error;
+
+        return 0;
+    }
+
+ error:
+    virReportError(VIR_ERR_INTERNAL_ERROR,
+                   _("Missing or invalid CPU address size in %s"),
+                   CPUINFO_PATH);
+    return -1;
+}
+
+
 int
 virHostCPUGetInfoPopulateLinux(FILE *cpuinfo,
                                virArch arch,
@@ -1616,6 +1651,20 @@ virHostCPUGetSignature(char **signature)
     return virHostCPUReadSignature(virArchFromHost(), cpuinfo, signature);
 }
 
+int
+virHostCPUGetPhysAddrSize(unsigned int *size)
+{
+    g_autoptr(FILE) cpuinfo = NULL;
+
+    if (!(cpuinfo = fopen(CPUINFO_PATH, "r"))) {
+        virReportSystemError(errno, _("Failed to open cpuinfo file '%s'"),
+                             CPUINFO_PATH);
+        return -1;
+    }
+
+    return virHostCPUParsePhysAddrSize(cpuinfo, size);
+}
+
 #else
 
 int
@@ -1625,6 +1674,12 @@ virHostCPUGetSignature(char **signature)
     return 0;
 }
 
+int
+virHostCPUGetPhysAddrSize(unsigned int *size)
+{
+    return 0;
+}
+
 #endif /* __linux__ */
 
 int
diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
index b8ea7aafad..5232fee36d 100644
--- a/src/util/virhostcpu.h
+++ b/src/util/virhostcpu.h
@@ -58,6 +58,7 @@ int virHostCPUGetInfo(virArch hostarch,
                       unsigned int *cores,
                       unsigned int *threads);
 
+
 int virHostCPUGetKVMMaxVCPUs(void) G_NO_INLINE;
 
 int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
@@ -86,6 +87,8 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void);
 
 int virHostCPUGetSignature(char **signature);
 
+int virHostCPUGetPhysAddrSize(unsigned int *size);
+
 int virHostCPUGetHaltPollTime(pid_t pid,
                               unsigned long long *haltPollSuccess,
                               unsigned long long *haltPollFail);
-- 
2.36.1


From jfehlig at suse.com  Fri Jul 29 19:34:35 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Fri, 29 Jul 2022 13:34:35 -0600
Subject: [PATCH V2 3/4] qemu: Add support for max physical address size
In-Reply-To: <20220729193436.15575-1-jfehlig@suse.com>
References: <20220729193436.15575-1-jfehlig@suse.com>
Message-ID: <20220729193436.15575-4-jfehlig@suse.com>

From: Dario Faggioli <dfaggioli at suse.com>

This patch maps /domain/cpu/maxphysaddr into -cpu parameters:

  - <maxphysaddr mode='passthrough'/> becomes host-phys-bits=on
  - <maxphysaddr mode='emualte' bits='42'/> becomes phys-bits=42

Passthrough mode can only be used if the chosen CPU model is
'host-passthrough'. Also validate that an explicitly specified
bits value does not exceed the physical address bits on the host.

The feature is available since QEMU 2.7.0.

Signed-off-by: Dario Faggioli <dfaggioli at suse.com>
Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 src/qemu/qemu_command.c                       | 21 +++++++++
 src/qemu/qemu_domain.c                        | 46 +++++++++++++++++++
 src/qemu/qemu_validate.c                      | 12 +++++
 .../cpu-phys-bits-emulate.args                | 32 +++++++++++++
 .../cpu-phys-bits-emulate.xml                 | 20 ++++++++
 .../cpu-phys-bits-emulate2.args               | 32 +++++++++++++
 .../cpu-phys-bits-emulate2.xml                | 20 ++++++++
 .../cpu-phys-bits-emulate3.err                |  1 +
 .../cpu-phys-bits-emulate3.xml                | 20 ++++++++
 .../cpu-phys-bits-passthrough.args            | 32 +++++++++++++
 .../cpu-phys-bits-passthrough.xml             | 20 ++++++++
 .../cpu-phys-bits-passthrough2.err            |  1 +
 .../cpu-phys-bits-passthrough2.xml            | 20 ++++++++
 .../cpu-phys-bits-passthrough3.err            |  1 +
 .../cpu-phys-bits-passthrough3.xml            | 20 ++++++++
 tests/qemuxml2argvtest.c                      |  7 +++
 16 files changed, 305 insertions(+)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 30c9bbbf2e..acf214be00 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6847,6 +6847,27 @@ qemuBuildCpuCommandLine(virCommand *cmd,
             virBufferAddLit(&buf, ",l3-cache=off");
     }
 
+    if (def->cpu && def->cpu->addr) {
+        virCPUMaxPhysAddrDef *addr = def->cpu->addr;
+
+        switch (addr->mode) {
+        case VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH:
+            virBufferAddLit(&buf, ",host-phys-bits=on");
+            break;
+
+        case VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE:
+            if (addr->bits != -1)
+                virBufferAsprintf(&buf, ",phys-bits=%d", addr->bits);
+            else
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                               _("Physical address bits unspecified"));
+            break;
+
+        case VIR_CPU_MAX_PHYS_ADDR_MODE_LAST:
+            break;
+        }
+    }
+
     cpu = virBufferContentAndReset(&cpu_buf);
     cpu_flags = virBufferContentAndReset(&buf);
 
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b02ffc9a2e..0c97744b72 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4429,6 +4429,52 @@ qemuDomainDefCPUPostParse(virDomainDef *def,
         }
     }
 
+    if (def->cpu->addr) {
+        virCPUMaxPhysAddrDef *addr = def->cpu->addr;
+
+        if (!ARCH_IS_X86(def->os.arch)) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                           _("CPU maximum physical address bits specification "
+                             "is not supported for '%s' architecture"),
+                           virArchToString(def->os.arch));
+            return -1;
+        }
+
+        switch (addr->mode) {
+        case VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH:
+            if (def->cpu->mode != VIR_CPU_MODE_HOST_PASSTHROUGH) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("CPU maximum physical address bits mode '%s' "
+                                 "can only be used with '%s' CPUs"),
+                               virCPUMaxPhysAddrModeTypeToString(addr->mode),
+                               virCPUModeTypeToString(VIR_CPU_MODE_HOST_PASSTHROUGH));
+                return -1;
+            }
+            if (addr->bits != -1) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("CPU maximum physical address bits number "
+                                 "specification cannot be used with "
+                                 "mode='%s'"),
+                               virCPUMaxPhysAddrModeTypeToString(VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH));
+                return -1;
+            }
+            break;
+
+        case VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE:
+            if (addr->bits == -1) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("if using CPU maximum physical address "
+                                 "mode='%s', bits= must be specified too"),
+                               virCPUMaxPhysAddrModeTypeToString(VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE));
+                return -1;
+            }
+            break;
+
+        case VIR_CPU_MAX_PHYS_ADDR_MODE_LAST:
+            break;
+        }
+    }
+
     for (i = 0; i < def->cpu->nfeatures; i++) {
         virCPUFeatureDef *feature = &def->cpu->features[i];
 
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 764d5b029e..b6c7d3b06a 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -380,6 +380,18 @@ qemuValidateDomainDefCpu(virQEMUDriver *driver,
         break;
     }
 
+    if (cpu->addr &&
+        cpu->addr->mode == VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE &&
+        driver->hostcpu &&
+        driver->hostcpu->addr) {
+        if (cpu->addr->bits > driver->hostcpu->addr->bits) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("The number of virtual CPU address bits cannot "
+                             "exceed the number supported by the host CPU"));
+            return -1;
+        }
+    }
+
     return 0;
 }
 
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
new file mode 100644
index 0000000000..f612f6889b
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-foo \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name guest=foo,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
+-machine pc,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host,phys-bits=42 \
+-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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-usb \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml
new file mode 100644
index 0000000000..f8bd63bc68
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough'>
+    <maxphysaddr mode='emulate' bits='42'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
new file mode 100644
index 0000000000..3489f44ded
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-foo \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name guest=foo,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
+-machine pc,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,phys-bits=42 \
+-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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-usb \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml
new file mode 100644
index 0000000000..188b3066ed
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate2.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-model'>
+    <maxphysaddr bits='42' mode='emulate'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err b/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err
new file mode 100644
index 0000000000..5e21998259
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err
@@ -0,0 +1 @@
+unsupported configuration: if using CPU maximum physical address mode='emulate', bits= must be specified too
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml b/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml
new file mode 100644
index 0000000000..30a14894dd
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough'>
+    <maxphysaddr mode='emulate'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
new file mode 100644
index 0000000000..df04195d1e
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.args
@@ -0,0 +1,32 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-foo \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-x86_64 \
+-name guest=foo,debug-threads=on \
+-S \
+-object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo/master-key.aes \
+-machine pc,usb=off,dump-guest-core=off \
+-accel kvm \
+-cpu host,host-phys-bits=on \
+-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=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-boot strict=on \
+-usb \
+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
+-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml
new file mode 100644
index 0000000000..db570beb8d
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough'>
+    <maxphysaddr mode='passthrough'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err
new file mode 100644
index 0000000000..22009cc6e6
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.err
@@ -0,0 +1 @@
+unsupported configuration: CPU maximum physical address bits mode 'passthrough' can only be used with 'host-passthrough' CPUs
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml
new file mode 100644
index 0000000000..511bbf9949
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough2.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-model'>
+    <maxphysaddr mode='passthrough'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err
new file mode 100644
index 0000000000..28f2e43432
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.err
@@ -0,0 +1 @@
+unsupported configuration: CPU maximum physical address bits number specification cannot be used with mode='passthrough'
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml
new file mode 100644
index 0000000000..a94e567dcb
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-passthrough3.xml
@@ -0,0 +1,20 @@
+<domain type='kvm'>
+  <name>foo</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219136</memory>
+  <currentMemory unit='KiB'>219136</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='x86_64' machine='pc'>hvm</type>
+    <boot dev='hd'/>
+  </os>
+  <cpu mode='host-passthrough'>
+    <maxphysaddr mode='passthrough' bits='42'/>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b72d61c3bc..4fd5120b70 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3470,6 +3470,13 @@ mymain(void)
     /* HVF guests should not work on Linux with KVM */
     DO_TEST_CAPS_LATEST_PARSE_ERROR("hvf-x86_64-q35-headless");
 
+    DO_TEST("cpu-phys-bits-passthrough", QEMU_CAPS_KVM);
+    DO_TEST("cpu-phys-bits-emulate", QEMU_CAPS_KVM);
+    DO_TEST("cpu-phys-bits-emulate2", QEMU_CAPS_KVM);
+    DO_TEST_PARSE_ERROR("cpu-phys-bits-emulate3", QEMU_CAPS_KVM);
+    DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough2", QEMU_CAPS_KVM);
+    DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough3", QEMU_CAPS_KVM);
+
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(fakerootdir);
 
-- 
2.36.1


From jfehlig at suse.com  Fri Jul 29 19:34:36 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Fri, 29 Jul 2022 13:34:36 -0600
Subject: [PATCH V2 4/4] cpu conf: Check ABI stability of CPU maxphysaddr config
In-Reply-To: <20220729193436.15575-1-jfehlig@suse.com>
References: <20220729193436.15575-1-jfehlig@suse.com>
Message-ID: <20220729193436.15575-5-jfehlig@suse.com>

Signed-off-by: Jim Fehlig <jfehlig at suse.com>
---
 src/conf/cpu_conf.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index e31c4ab467..8e75cdbb4f 100644
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -1127,6 +1127,15 @@ virCPUDefIsEqual(virCPUDef *src,
         return false;
     }
 
+    if ((src->addr && !dst->addr) ||
+        (!src->addr && dst->addr) ||
+        (src->addr && dst->addr &&
+         (src->addr->mode != dst->addr->mode ||
+          src->addr->bits != dst->addr->bits))) {
+        MISMATCH("%s", _("Target CPU maxphysaddr does not match source"));
+        return false;
+    }
+
     if (src->nfeatures != dst->nfeatures) {
         MISMATCH(_("Target CPU feature count %zu does not match source %zu"),
                  dst->nfeatures, src->nfeatures);
-- 
2.36.1


From prapal at linux.microsoft.com  Fri Jul 29 20:36:57 2022
From: prapal at linux.microsoft.com (Praveen K Paladugu)
Date: Fri, 29 Jul 2022 20:36:57 +0000
Subject: [libvirt PATCH 2/2] conf: set the default chr device type to pty
In-Reply-To: <20220729203657.4761-1-prapal@linux.microsoft.com>
References: <20220729203657.4761-1-prapal@linux.microsoft.com>
Message-ID: <20220729203657.4761-3-prapal@linux.microsoft.com>

explicitly set the chr device type to pty to pass the
checks of ch driver.
https://gitlab.com/libvirt/libvirt/-/issues/344

Signed-off-by: Praveen K Paladugu <prapal at linux.microsoft.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 e85cc1f809..abe9d8ae08 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10078,6 +10078,7 @@ virDomainChrSourceDefNew(virDomainXMLOption *xmlopt)
 
     if (!(def = virObjectNew(virDomainChrSourceDefClass)))
         return NULL;
+    def->type = VIR_DOMAIN_CHR_TYPE_PTY;
 
     if (xmlopt && xmlopt->privateData.chrSourceNew &&
         !(def->privateData = xmlopt->privateData.chrSourceNew())) {
-- 
2.27.0


From prapal at linux.microsoft.com  Fri Jul 29 20:36:56 2022
From: prapal at linux.microsoft.com (Praveen K Paladugu)
Date: Fri, 29 Jul 2022 20:36:56 +0000
Subject: [libvirt PATCH 1/2] ch: drop the check to have a single console/serial
In-Reply-To: <20220729203657.4761-1-prapal@linux.microsoft.com>
References: <20220729203657.4761-1-prapal@linux.microsoft.com>
Message-ID: <20220729203657.4761-2-prapal@linux.microsoft.com>

Starting with version 18.0, cloud-hypervisor supports a console
and a serial device in parallel.
https://github.com/cloud-hypervisor/cloud-hypervisor/issues/3012

Signed-off-by: Praveen K Paladugu <prapal at linux.microsoft.com>
---
 src/ch/ch_domain.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index ae53c6fe05..bf687a6c32 100644
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -281,14 +281,7 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *dev,
         return -1;
     }
 
-    if ((def->nconsoles &&
-         def->consoles[0]->source->type == VIR_DOMAIN_CHR_TYPE_PTY)
-        && (def->nserials &&
-            def->serials[0]->source->type == VIR_DOMAIN_CHR_TYPE_PTY)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("Only a single console or serial can be configured for this domain"));
-        return -1;
-    } else if (def->nconsoles > 1) {
+    if (def->nconsoles > 1) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Only a single console can be configured for this domain"));
         return -1;
-- 
2.27.0


From prapal at linux.microsoft.com  Fri Jul 29 20:36:55 2022
From: prapal at linux.microsoft.com (Praveen K Paladugu)
Date: Fri, 29 Jul 2022 20:36:55 +0000
Subject: [libvirt PATCH 0/2] fix console device access in ch driver
Message-ID: <20220729203657.4761-1-prapal@linux.microsoft.com>

Patch1:
Drops the check to only have a console/serial device configured
for ch VMs. This is no longer needed.

Patch2:
Addresses https://gitlab.com/libvirt/libvirt/-/issues/344. Libvirt adds compat
console devices for "hvm" VMs. The added console/serial device type is
initialized to VIR_DOMAIN_CHR_TYPE_NULL, when in fact the device added is a pty
device. This patch modifies the default console device type to "pty".

I looked at NOT adding Compat Console devices for ch VMs. But this looked like
a better fix.

Praveen K Paladugu (2):
  ch: drop the check to have a single console/serial
  conf: set the default chr device type to pty

 src/ch/ch_domain.c     | 9 +--------
 src/conf/domain_conf.c | 1 +
 2 files changed, 2 insertions(+), 8 deletions(-)

-- 
2.27.0


From jfehlig at suse.com  Fri Jul 29 21:45:09 2022
From: jfehlig at suse.com (Jim Fehlig)
Date: Fri, 29 Jul 2022 15:45:09 -0600
Subject: [PATCH] spec: Remove duplicate check of libvirtd status
In-Reply-To: <20220720141212.3544-1-jfehlig@suse.com>
References: <20220720141212.3544-1-jfehlig@suse.com>
Message-ID: <ac1af441-162d-1b70-2ac9-09a2829deacd@suse.com>

Hi,

Any comments on this patch?

Regards,
Jim

On 7/20/22 08:12, Jim Fehlig wrote:
> The %posttrans scriptlet checks if libvirtd is active within a
> condition that is only executed if libvirtd is active. Remove the
> duplicate check.
> 
> Signed-off-by: Jim Fehlig <jfehlig at suse.com>
> ---
> 
> This patch contains an improvement Martin suggested while reviewing
> another patch to the posttrans scriptlet
> 
> https://listman.redhat.com/archives/libvir-list/2022-July/232947.html
> 
> The problem of not restarting socket units if libvird is inactive persists,
> but it is not clear if socket units need restarted on package update.
> 
>   libvirt.spec.in | 18 ++++++------------
>   1 file changed, 6 insertions(+), 12 deletions(-)
> 
> diff --git a/libvirt.spec.in b/libvirt.spec.in
> index 9d788b790f..a238edf2aa 100644
> --- a/libvirt.spec.in
> +++ b/libvirt.spec.in
> @@ -1365,18 +1365,12 @@ then
>           # 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 \
> -                    libvirtd-ro.socket \
> -                    libvirtd-admin.socket >/dev/null 2>&1 || :
> -
> -            /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
> -        fi
> +        /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
> +        /bin/systemctl try-restart \
> +                libvirtd.socket \
> +                libvirtd-ro.socket \
> +                libvirtd-admin.socket >/dev/null 2>&1 || :
> +        /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
>       fi
>   fi
>   


From haboustak at gmail.com  Sun Jul 31 10:40:11 2022
From: haboustak at gmail.com (Mike Haboustak)
Date: Sun, 31 Jul 2022 06:40:11 -0400
Subject: [libvirt] Semantic change in v4.3 slows down image creation and
 snapshots (on ZFS)
In-Reply-To: <20191009123317.GF3981@redhat.com>
References: <CAATJJ0JMEG9S_zJ3qD9Cq2m_V3-rKrm0sX_4GaOS7Wu5P+Zi9w@mail.gmail.com>
 <20191009122509.GQ6129@angien.pipo.sk> <20191009123317.GF3981@redhat.com>
Message-ID: <CAMGCZS=KVUtCRiieFVkdmrMde1SC5MdOt7taaU4412YQFzOfcw@mail.gmail.com>

On Wed, Oct 9, 2019 at 8:33 AM Daniel P. Berrang? <berrange at redhat.com> wrote:
> On Wed, Oct 09, 2019 at 02:25:09PM +0200, Peter Krempa wrote:
> > On Wed, Oct 09, 2019 at 13:39:54 +0200, Christian Ehrhardt wrote:
> > > Up until the commit above that was using preallocation=metadata, but
> > > now uses preallocation=falloc.
>
> > Semantically the change above would make sense if it weren't coupled to
> > the presence of VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA.
> >
> > The flags semantics imply that metadata allocation is requested and thus
> > metadata should be allocated.
> >
> > On the other hand doing full allocation if the flag is not present but
> > the XML calls for it would semantically be okay IMO.
>
> Yeah, I agree with this.
>
> > I'm not sure if that is what you expect though.
>
> virt-manager passes VOL_CREATE_PREALLOC_METADATA, so honouring that flag
> correctly would fix the problem reported with ZFS.

I know that this is an old message, but I'm just getting around to updating
some of my libvirt-python scripts and I'm encountering a similar problem to
virt-manager when using libvirt >=4.3, without the ZFS part.

Prior to libvirt v4.3, my script created qcow2-format StorageVolumes with a
<capacity/> element, and no <allocation/> element. It used the flag
VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA to request metadata-only
prealloc, which the documentation of virStorageVolCreateXml describes
as creating
a sparse file:

> Since 1.0.1 VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA in flags
> can be used to get higher performance with qcow2 image files which don't support
> full preallocation, by creating a sparse image file with metadata.

The patch identified in this thread does not create a sparse file even in the
presence of this flag when the requested capacity is equal to the requested
allocation.

You could just update the documentation to match current behavior, but I
think that this is a bug and that qemu-img's prealloc=metadata option should
always be used when VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA
is specified.

It also seems that the documentation is out-of-date in regards to qcow2 not
supporting full preallocation.

As mentioned previously, using the StorageVolume's <allocation /> element as
an input does not work for qcow2. The requested allocation size is never
honored by qemu-img. There is no concept of partial preallocation. There is only
full prealloc and sparse metadata prealloc.

Thanks,
Mike