libvirt-9.5.0-3.el9

- tests: remove acpi support from s390x ccw hotplug tests (rhbz#2168499) - tests: add capabilities for QEMU 8.1.0 on s390x (rhbz#2168499) - qemu: add run-with async-teardown capability (rhbz#2168499) - qemu: allow use of async teardown in domain (rhbz#2168499) - conf: domcaps: Add 'async-teardown' domain capability (rhbz#2168499) - qemu: S390 does not provide physical address size (rhbz#2224016) - nodedev: report mdev persistence properly (rhbz#2143158) - node_device: Don't leak error message buffer from virMdevctlListDefined|Active (rhbz#2143158) Resolves: rhbz#2143158, rhbz#2168499, rhbz#2224016
2023-07-21 23:25:10 +02:00 · 2023-07-21 23:25:10 +02:00 · a63d9ba90e
commit a63d9ba90e
parent 04cb88e791
9 changed files with 42221 additions and 1 deletions
--- a/libvirt-conf-domcaps-Add-async-teardown-domain-capability.patch
+++ b/libvirt-conf-domcaps-Add-async-teardown-domain-capability.patch
--- a/libvirt-node_device-Don-t-leak-error-message-buffer-from-virMdevctlListDefined-Active.patch
+++ b/libvirt-node_device-Don-t-leak-error-message-buffer-from-virMdevctlListDefined-Active.patch
@ -0,0 +1,79 @@
 From f158b6573ac39bdd1ba36c3900e65afffe57f3ca Mon Sep 17 00:00:00 2001
 Message-ID: <f158b6573ac39bdd1ba36c3900e65afffe57f3ca.1689974710.git.jdenemar@redhat.com>
 From: Peter Krempa <pkrempa@redhat.com>
 Date: Wed, 19 Jul 2023 15:22:22 +0200
 Subject: [PATCH] node_device: Don't leak error message buffer from
 virMdevctlListDefined|Active
 nodeDeviceUpdateMediatedDevices invokes virMdevctlListDefined and
 virMdevctlListActive both of which were passed the same 'errmsg' buffer.
 Since virCommandSetErrorBuffer() always allocates the error buffer one
 of them was leaked.
 Fix it by populating the 'errmsg' buffer only on failure of
 virMdevctlListActive|Defined which invoke the command.
 Add a comment to nodeDeviceGetMdevctlListCommand reminding how
 virCommandSetErrorBuffer() works.
 Fixes: 44a0f2f0c8f
 Signed-off-by: Peter Krempa <pkrempa@redhat.com>
 Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2143158
 (cherry picked from commit 7ca777cc09242cb3a30b12d5e0e396c6aaf1a5e7)
 Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
 ---
 src/node_device/node_device_driver.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
 diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
 index 5dc45ddbb4..2ef9197adc 100644
 --- a/src/node_device/node_device_driver.c
 +++ b/src/node_device/node_device_driver.c
@@ -1044,6 +1044,15 @@ virMdevctlSetAutostart(virNodeDeviceDef *def, bool autostart, char **errmsg)
 }
 +/**
 + * nodeDeviceGetMdevctlListCommand:
 + * @defined: list mdevctl entries with persistent config
 + * @output: filled with the output of mdevctl once invoked
 + * @errmsg: always allocated, optionally filled with error from 'mdevctl'
 + *
 + * Prepares a virCommand structure to invoke 'mdevctl' caller is responsible to
 + * free the buffers which are filled by the virCommand infrastructure.
 + */
 virCommand*
 nodeDeviceGetMdevctlListCommand(bool defined,
                                 char **output,
@@ -1624,9 +1633,11 @@ virMdevctlListDefined(virNodeDeviceDef ***devs, char **errmsg)
 {
     int status;
     g_autofree char *output = NULL;
 -    g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(true, &output, errmsg);
 +    g_autofree char *errbuf = NULL;
 +    g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(true, &output, &errbuf);
     if (virCommandRun(cmd, &status) < 0 || status != 0) {
 +        *errmsg = g_steal_pointer(&errbuf);
         return -1;
     }
@@ -1642,9 +1653,11 @@ virMdevctlListActive(virNodeDeviceDef ***devs, char **errmsg)
 {
     int status;
     g_autofree char *output = NULL;
 -    g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, errmsg);
 +    g_autofree char *errbuf = NULL;
 +    g_autoptr(virCommand) cmd = nodeDeviceGetMdevctlListCommand(false, &output, &errbuf);
     if (virCommandRun(cmd, &status) < 0 || status != 0) {
 +        *errmsg = g_steal_pointer(&errbuf);
         return -1;
     }
 -- 
 2.41.0
--- a/libvirt-nodedev-report-mdev-persistence-properly.patch
+++ b/libvirt-nodedev-report-mdev-persistence-properly.patch
@ -0,0 +1,104 @@
 From c2150285aff9b308b969d5fc6f32f75db620dfe3 Mon Sep 17 00:00:00 2001
 Message-ID: <c2150285aff9b308b969d5fc6f32f75db620dfe3.1689974710.git.jdenemar@redhat.com>
 From: Jonathon Jongsma <jjongsma@redhat.com>
 Date: Tue, 18 Jul 2023 14:47:49 -0500
 Subject: [PATCH] nodedev: report mdev persistence properly
 Since commit 44a0f2f0, we now query mdevctl for transient (active) mdevs
 in order to gather attributes for the mdev. Unfortunately, this commit
 introduced a regression because nodeDeviceUpdateMediatedDevice() assumed
 that all mdevs returned from mdevctl were actually persistent mdevs but
 we were using it to update transient mdevs. Refactor the function so
 that we can use it to update both persistent and transient mdevs.
 Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
 Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2143158
 (cherry picked from commit fa0d5f4ebc0aa178d9dea278914f9149a4c4af54)
 Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
 ---
 src/node_device/node_device_driver.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
 diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
 index a2d0600560..5dc45ddbb4 100644
 --- a/src/node_device/node_device_driver.c
 +++ b/src/node_device/node_device_driver.c
@@ -1339,11 +1339,12 @@ nodeDeviceDestroy(virNodeDevicePtr device)
 /* takes ownership of @def and potentially frees it. @def should not be used
  * after returning from this function */
 static int
 -nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def)
 +nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def,
 +                               bool defined)
 {
     virNodeDeviceObj *obj;
     virObjectEvent *event;
 -    bool defined = false;
 +    bool was_defined = false;
     g_autoptr(virNodeDeviceDef) owned = def;
     g_autofree char *name = g_strdup(owned->name);
@@ -1359,13 +1360,13 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def)
         bool changed;
         virNodeDeviceDef *olddef = virNodeDeviceObjGetDef(obj);
 -        defined = virNodeDeviceObjIsPersistent(obj);
 +        was_defined = virNodeDeviceObjIsPersistent(obj);
         /* Active devices contain some additional information (e.g. sysfs
          * path) that is not provided by mdevctl, so re-use the existing
          * definition and copy over new mdev data */
         changed = nodeDeviceDefCopyFromMdevctl(olddef, owned);
 -        if (defined && !changed) {
 +        if (was_defined && !changed) {
             /* if this device was already defined and the definition
              * hasn't changed, there's nothing to do for this device */
             virNodeDeviceObjEndAPI(&obj);
@@ -1373,11 +1374,11 @@ nodeDeviceUpdateMediatedDevice(virNodeDeviceDef *def)
         }
     }
 -    /* all devices returned by virMdevctlListDefined() are persistent */
 -    virNodeDeviceObjSetPersistent(obj, true);
 +    if (defined)
 +        virNodeDeviceObjSetPersistent(obj, true);
     virNodeDeviceObjSetAutostart(obj, def->caps->data.mdev.autostart);
 -    if (!defined)
 +    if (!was_defined && defined)
         event = virNodeDeviceEventLifecycleNew(name,
                                                VIR_NODE_DEVICE_EVENT_DEFINED,
                                                0);
@@ -1447,7 +1448,7 @@ nodeDeviceDefineXML(virConnect *conn,
      * have already received the uuid from virMdevctlDefine(), we can simply
      * add the provisional device to the list and return it immediately and
      * avoid this long delay. */
 -    if (nodeDeviceUpdateMediatedDevice(g_steal_pointer(&def)) < 0)
 +    if (nodeDeviceUpdateMediatedDevice(g_steal_pointer(&def), true) < 0)
         return NULL;
     return virGetNodeDevice(conn, name);
@@ -1742,7 +1743,7 @@ nodeDeviceUpdateMediatedDevices(void)
                                       removeMissingPersistentMdev, &data);
     for (i = 0; i < data.ndefs; i++)
 -        if (nodeDeviceUpdateMediatedDevice(defs[i]) < 0)
 +        if (nodeDeviceUpdateMediatedDevice(defs[i], true) < 0)
             return -1;
     /* Update active/transient mdev devices */
@@ -1753,7 +1754,7 @@ nodeDeviceUpdateMediatedDevices(void)
     }
     for (i = 0; i < act_ndefs; i++)
 -        if (nodeDeviceUpdateMediatedDevice(act_defs[i]) < 0)
 +        if (nodeDeviceUpdateMediatedDevice(act_defs[i], false) < 0)
             return -1;
     return 0;
 -- 
 2.41.0
--- a/libvirt-qemu-S390-does-not-provide-physical-address-size.patch
+++ b/libvirt-qemu-S390-does-not-provide-physical-address-size.patch
@ -0,0 +1,175 @@
 From 5af7ae809ed21678c265a9559c9f70b90dcd31d9 Mon Sep 17 00:00:00 2001
 Message-ID: <5af7ae809ed21678c265a9559c9f70b90dcd31d9.1689974710.git.jdenemar@redhat.com>
 From: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Date: Fri, 14 Jul 2023 16:38:14 +0200
 Subject: [PATCH] qemu: S390 does not provide physical address size
 Commit be1b7d5b18 introduced parsing /proc/cpuinfo for "address size"
 which is not including on S390 and therefore reports an internal error.
 Lets remove the parsing on S390.
 Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
 Reviewed-by: Collin Walling <walling@linux.ibm.com>
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 (cherry picked from commit 8417c1394cd4deccee07235d4f7b2c54b774b08d)
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2224016
 Signed-off-by: Boris Fiuczynski <bfiuczyn@redhat.com>
 ---
 src/cpu/cpu_x86.c                         |  2 +-
 src/qemu/qemu_capabilities.c              |  2 +-
 src/util/virhostcpu.c                     | 12 ++++++++++--
 src/util/virhostcpu.h                     |  3 ++-
 tests/domaincapsdata/qemu_4.2.0.s390x.xml |  1 -
 tests/domaincapsdata/qemu_5.2.0.s390x.xml |  1 -
 tests/domaincapsdata/qemu_6.0.0.s390x.xml |  1 -
 tests/domaincapsdata/qemu_8.1.0.s390x.xml |  1 -
 tests/domaincapsmock.c                    |  8 ++++++--
 9 files changed, 20 insertions(+), 11 deletions(-)
 diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
 index 8d371d5501..3c0163c4d1 100644
 --- a/src/cpu/cpu_x86.c
 +++ b/src/cpu/cpu_x86.c
@@ -2795,7 +2795,7 @@ virCPUx86GetHost(virCPUDef *cpu,
         VIR_DEBUG("Host CPU does not support invariant TSC");
     }
 -    if (virHostCPUGetPhysAddrSize(&addrsz) == 0) {
 +    if (virHostCPUGetPhysAddrSize(cpuData->arch, &addrsz) == 0) {
         virCPUMaxPhysAddrDef *addr = g_new0(virCPUMaxPhysAddrDef, 1);
         addr->bits = addrsz;
 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
 index 338608f0a2..85ea879f0b 100644
 --- a/src/qemu/qemu_capabilities.c
 +++ b/src/qemu/qemu_capabilities.c
@@ -3911,7 +3911,7 @@ virQEMUCapsInitHostCPUModel(virQEMUCaps *qemuCaps,
     }
     if (virQEMUCapsTypeIsAccelerated(type))
 -        virHostCPUGetPhysAddrSize(&physAddrSize);
 +        virHostCPUGetPhysAddrSize(hostArch, &physAddrSize);
     virQEMUCapsSetHostModel(qemuCaps, type, physAddrSize, cpu, migCPU, fullCPU);
 diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
 index 19195a1470..a15731e9ea 100644
 --- a/src/util/virhostcpu.c
 +++ b/src/util/virhostcpu.c
@@ -1646,10 +1646,17 @@ virHostCPUGetSignature(char **signature)
 }
 int
 -virHostCPUGetPhysAddrSize(unsigned int *size)
 +virHostCPUGetPhysAddrSize(const virArch hostArch,
 +                          unsigned int *size)
 {
     g_autoptr(FILE) cpuinfo = NULL;
 +    if (ARCH_IS_S390(hostArch)) {
 +        /* Ensure size is set to 0 as physical address size is unknown */
 +        *size = 0;
 +        return 0;
 +    }
 +
     if (!(cpuinfo = fopen(CPUINFO_PATH, "r"))) {
         virReportSystemError(errno, _("Failed to open cpuinfo file '%1$s'"),
                              CPUINFO_PATH);
@@ -1669,7 +1676,8 @@ virHostCPUGetSignature(char **signature)
 }
 int
 -virHostCPUGetPhysAddrSize(unsigned int *size G_GNUC_UNUSED)
 +virHostCPUGetPhysAddrSize(const virArch hostArch G_GNUC_UNUSED,
 +                          unsigned int *size G_GNUC_UNUSED)
 {
     errno = ENOSYS;
     return -1;
 diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
 index 5232fee36d..5f0d43e069 100644
 --- a/src/util/virhostcpu.h
 +++ b/src/util/virhostcpu.h
@@ -87,7 +87,8 @@ virHostCPUTscInfo *virHostCPUGetTscInfo(void);
 int virHostCPUGetSignature(char **signature);
 -int virHostCPUGetPhysAddrSize(unsigned int *size);
 +int virHostCPUGetPhysAddrSize(const virArch hostArch,
 +                              unsigned int *size);
 int virHostCPUGetHaltPollTime(pid_t pid,
                               unsigned long long *haltPollSuccess,
 diff --git a/tests/domaincapsdata/qemu_4.2.0.s390x.xml b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
 index da271825f9..2566f42997 100644
 --- a/tests/domaincapsdata/qemu_4.2.0.s390x.xml
 +++ b/tests/domaincapsdata/qemu_4.2.0.s390x.xml
@@ -38,7 +38,6 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen15a-base</model>
 -      <maxphysaddr mode='passthrough' limit='64'/>
       <feature policy='require' name='aen'/>
       <feature policy='require' name='cmmnt'/>
       <feature policy='require' name='vxpdeh'/>
 diff --git a/tests/domaincapsdata/qemu_5.2.0.s390x.xml b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
 index 99faaad866..12f38d3638 100644
 --- a/tests/domaincapsdata/qemu_5.2.0.s390x.xml
 +++ b/tests/domaincapsdata/qemu_5.2.0.s390x.xml
@@ -38,7 +38,6 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen15a-base</model>
 -      <maxphysaddr mode='passthrough' limit='64'/>
       <feature policy='require' name='aen'/>
       <feature policy='require' name='cmmnt'/>
       <feature policy='require' name='vxpdeh'/>
 diff --git a/tests/domaincapsdata/qemu_6.0.0.s390x.xml b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
 index df3708f801..703f729ae2 100644
 --- a/tests/domaincapsdata/qemu_6.0.0.s390x.xml
 +++ b/tests/domaincapsdata/qemu_6.0.0.s390x.xml
@@ -38,7 +38,6 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen15a-base</model>
 -      <maxphysaddr mode='passthrough' limit='64'/>
       <feature policy='require' name='aen'/>
       <feature policy='require' name='cmmnt'/>
       <feature policy='require' name='vxpdeh'/>
 diff --git a/tests/domaincapsdata/qemu_8.1.0.s390x.xml b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
 index d70b639503..3562e96965 100644
 --- a/tests/domaincapsdata/qemu_8.1.0.s390x.xml
 +++ b/tests/domaincapsdata/qemu_8.1.0.s390x.xml
@@ -38,7 +38,6 @@
     </mode>
     <mode name='host-model' supported='yes'>
       <model fallback='forbid'>gen16a-base</model>
 -      <maxphysaddr mode='passthrough' limit='64'/>
       <feature policy='require' name='nnpa'/>
       <feature policy='require' name='aen'/>
       <feature policy='require' name='cmmnt'/>
 diff --git a/tests/domaincapsmock.c b/tests/domaincapsmock.c
 index cecb333602..6ae0c4ad45 100644
 --- a/tests/domaincapsmock.c
 +++ b/tests/domaincapsmock.c
@@ -37,9 +37,13 @@ virHostCPUGetMicrocodeVersion(virArch hostArch G_GNUC_UNUSED)
 }
 int
 -virHostCPUGetPhysAddrSize(unsigned int *size)
 +virHostCPUGetPhysAddrSize(const virArch hostArch,
 +                          unsigned int *size)
 {
 -    *size = 64;
 +    if (ARCH_IS_S390(hostArch))
 +        *size = 0;
 +    else
 +        *size = 64;
     return 0;
 }
 -- 
 2.41.0
--- a/libvirt-qemu-add-run-with-async-teardown-capability.patch
+++ b/libvirt-qemu-add-run-with-async-teardown-capability.patch
@ -0,0 +1,97 @@
 From 1c1274ab6be81184ca2193a86735e2edb27aee8d Mon Sep 17 00:00:00 2001
 Message-ID: <1c1274ab6be81184ca2193a86735e2edb27aee8d.1689974709.git.jdenemar@redhat.com>
 From: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Date: Wed, 5 Jul 2023 08:20:25 +0200
 Subject: [PATCH] qemu: add run-with async-teardown capability
 QEMU capability is looking in query-command-line-options response for
 ...
    {
      "parameters": [
        {
          "name": "async-teardown",
          "type": "boolean"
        }
      ],
      "option": "run-with"
    }
 ...
 allow to use the QEMU option -run-with async-teardown=on|off
 Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 (cherry picked from commit 65c6513811d1cdc7e97319164d7528411520dd0c)
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2168499
 Signed-off-by: Boris Fiuczynski <bfiuczyn@redhat.com>
 ---
 src/qemu/qemu_capabilities.c                     | 4 ++++
 src/qemu/qemu_capabilities.h                     | 3 +++
 tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml  | 1 +
 tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 +
 4 files changed, 9 insertions(+)
 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
 index 7dad7231ee..c9f4b17208 100644
 --- a/src/qemu/qemu_capabilities.c
 +++ b/src/qemu/qemu_capabilities.c
@@ -694,6 +694,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "rbd-encryption-layering", /* QEMU_CAPS_RBD_ENCRYPTION_LAYERING */
               "rbd-encryption-luks-any", /* QEMU_CAPS_RBD_ENCRYPTION_LUKS_ANY */
               "qcow2-discard-no-unref", /* QEMU_CAPS_QCOW2_DISCARD_NO_UNREF */
 +
 +              /* 450 */
 +              "run-with.async-teardown", /* QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN */
     );
@@ -3369,6 +3372,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
     { "spice", "gl", QEMU_CAPS_SPICE_GL },
     { "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
     { "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL },
 +    { "run-with", "async-teardown", QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN },
 };
 static int
 diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
 index ce545cb2cc..2460fa7fa0 100644
 --- a/src/qemu/qemu_capabilities.h
 +++ b/src/qemu/qemu_capabilities.h
@@ -674,6 +674,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_RBD_ENCRYPTION_LUKS_ANY, /* luks-any (LUKS and LUKS2) encryption format for Ceph RBD */
     QEMU_CAPS_QCOW2_DISCARD_NO_UNREF, /* qcow2 block driver allows discards without unrefing the sector */
 +    /* 450 */
 +    QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN, /* asynchronous teardown -run-with async-teardown=on|off */
 +
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
 diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
 index 23b5aece15..88c7ac89db 100644
 --- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
 +++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -114,6 +114,7 @@
   <flag name='virtio-gpu.blob'/>
   <flag name='rbd-encryption-layering'/>
   <flag name='rbd-encryption-luks-any'/>
 +  <flag name='run-with.async-teardown'/>
   <version>8000050</version>
   <microcodeVersion>39100245</microcodeVersion>
   <package>v8.0.0-1270-g1c12355b</package>
 diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
 index f717c83fec..475496a8c8 100644
 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
 +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -206,6 +206,7 @@
   <flag name='rbd-encryption-layering'/>
   <flag name='rbd-encryption-luks-any'/>
   <flag name='qcow2-discard-no-unref'/>
 +  <flag name='run-with.async-teardown'/>
   <version>8000050</version>
   <microcodeVersion>43100245</microcodeVersion>
   <package>v8.0.0-1739-g5f9dd6a8ce</package>
 -- 
 2.41.0
--- a/libvirt-qemu-allow-use-of-async-teardown-in-domain.patch
+++ b/libvirt-qemu-allow-use-of-async-teardown-in-domain.patch
@ -0,0 +1,836 @@
 From d216c360f9d0acda0726194aed81e145018a3951 Mon Sep 17 00:00:00 2001
 Message-ID: <d216c360f9d0acda0726194aed81e145018a3951.1689974709.git.jdenemar@redhat.com>
 From: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Date: Wed, 5 Jul 2023 08:20:26 +0200
 Subject: [PATCH] qemu: allow use of async teardown in domain
 Asynchronous teardown can be specified if the QEMU binary supports it by
 adding in the domain XML
  <features>
    ...
    <async-teardown enabled='yes|no'/>
    ...
  </features>
 By default this new feature is disabled.
 Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Reviewed-by: Thomas Huth <thuth@redhat.com>
 Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 (cherry picked from commit 3bf02acdc5446b2c4a3078f99d8f5232acff9043)
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2168499
 Signed-off-by: Boris Fiuczynski <bfiuczyn@redhat.com>
 ---
 docs/formatdomain.rst                         |  6 +++
 src/conf/domain_conf.c                        | 22 ++++++++++
 src/conf/domain_conf.h                        |  1 +
 src/conf/schemas/domaincommon.rng             |  9 ++++
 src/qemu/qemu_command.c                       | 22 ++++++++++
 src/qemu/qemu_validate.c                      |  9 ++++
 .../async-teardown.x86_64-latest.args         | 37 ++++++++++++++++
 tests/qemuxml2argvdata/async-teardown.xml     | 31 +++++++++++++
 ...0-async-teardown-disabled.s390x-6.0.0.args | 35 +++++++++++++++
 ...-async-teardown-disabled.s390x-latest.args | 36 +++++++++++++++
 .../s390-async-teardown-disabled.xml          | 24 ++++++++++
 ...async-teardown-no-attrib.s390x-latest.args | 36 +++++++++++++++
 .../s390-async-teardown-no-attrib.xml         | 24 ++++++++++
 .../s390-async-teardown.s390x-6.0.0.err       |  1 +
 .../s390-async-teardown.s390x-latest.args     | 36 +++++++++++++++
 .../qemuxml2argvdata/s390-async-teardown.xml  | 24 ++++++++++
 tests/qemuxml2argvtest.c                      |  7 +++
 .../async-teardown.x86_64-latest.xml          | 44 +++++++++++++++++++
 ...90-async-teardown-disabled.s390x-6.0.0.xml | 36 +++++++++++++++
 ...0-async-teardown-disabled.s390x-latest.xml | 36 +++++++++++++++
 ...-async-teardown-no-attrib.s390x-latest.xml | 36 +++++++++++++++
 .../s390-async-teardown.s390x-latest.xml      | 36 +++++++++++++++
 tests/qemuxml2xmltest.c                       |  6 +++
 23 files changed, 554 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/async-teardown.x86_64-latest.args
 create mode 100644 tests/qemuxml2argvdata/async-teardown.xml
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-disabled.xml
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args
 create mode 100644 tests/qemuxml2argvdata/s390-async-teardown.xml
 create mode 100644 tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml
 create mode 100644 tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml
 diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
 index f29449f749..c61c8a3fec 100644
 --- a/docs/formatdomain.rst
 +++ b/docs/formatdomain.rst
@@ -2000,6 +2000,7 @@ Hypervisors may allow certain CPU / machine features to be toggled on/off.
      <tcg>
        <tb-cache unit='MiB'>128</tb-cache>
      </tcg>
 +     <async-teardown enabled='yes'/>
    </features>
    ...
@@ -2230,6 +2231,11 @@ are:
    tb-cache    The size of translation block cache size       an integer (a multiple of MiB)                      :since:`8.0.0`
    =========== ============================================== =================================================== ==============
 +``async-teardown``
 +   Depending on the ``enabled`` attribute (values ``yes``, ``no``) enable or
 +   disable QEMU asynchronous teardown to improve memory reclaiming on a guest.
 +   :since:`Since 9.6.0` (QEMU only)
 +
 Time keeping
 ------------
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
 index 4121b6a054..5ac5c0b771 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
@@ -181,6 +181,7 @@ VIR_ENUM_IMPL(virDomainFeature,
               "sbbc",
               "ibs",
               "tcg",
 +              "async-teardown",
 );
 VIR_ENUM_IMPL(virDomainCapabilitiesPolicy,
@@ -16689,6 +16690,20 @@ virDomainFeaturesDefParse(virDomainDef *def,
                 return -1;
             break;
 +        case VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN: {
 +            virTristateBool enabled;
 +
 +            if (virXMLPropTristateBool(nodes[i], "enabled",
 +                                       VIR_XML_PROP_NONE, &enabled) < 0)
 +                return -1;
 +
 +            if (enabled == VIR_TRISTATE_BOOL_ABSENT)
 +                enabled = VIR_TRISTATE_BOOL_YES;
 +
 +            def->features[val] = enabled;
 +            break;
 +        }
 +
         case VIR_DOMAIN_FEATURE_LAST:
             break;
         }
@@ -20628,6 +20643,7 @@ virDomainDefFeaturesCheckABIStability(virDomainDef *src,
         case VIR_DOMAIN_FEATURE_MSRS:
         case VIR_DOMAIN_FEATURE_TCG:
 +        case VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN:
         case VIR_DOMAIN_FEATURE_LAST:
             break;
         }
@@ -27340,6 +27356,12 @@ virDomainDefFormatFeatures(virBuffer *buf,
             virDomainFeatureTCGFormat(&childBuf, def);
             break;
 +        case VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN:
 +            if (def->features[i] != VIR_TRISTATE_SWITCH_ABSENT)
 +                virBufferAsprintf(&childBuf, "<async-teardown enabled='%s'/>\n",
 +                                  virTristateBoolTypeToString(def->features[i]));
 +            break;
 +
         case VIR_DOMAIN_FEATURE_LAST:
             break;
         }
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
 index cddaa3824d..c857ba556f 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
@@ -2170,6 +2170,7 @@ typedef enum {
     VIR_DOMAIN_FEATURE_SBBC,
     VIR_DOMAIN_FEATURE_IBS,
     VIR_DOMAIN_FEATURE_TCG,
 +    VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN,
     VIR_DOMAIN_FEATURE_LAST
 } virDomainFeature;
 diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
 index fcf9e00600..c2f56b0490 100644
 --- a/src/conf/schemas/domaincommon.rng
 +++ b/src/conf/schemas/domaincommon.rng
@@ -6660,6 +6660,15 @@
           <optional>
             <ref name="tcgfeatures"/>
           </optional>
 +          <optional>
 +            <element name="async-teardown">
 +              <optional>
 +                <attribute name="enabled">
 +                  <ref name="virYesNo"/>
 +                </attribute>
 +              </optional>
 +            </element>
 +          </optional>
         </interleave>
       </element>
     </optional>
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
 index cde6ab4dde..ec5d8b52d4 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
@@ -10175,6 +10175,25 @@ qemuBuildCryptoCommandLine(virCommand *cmd,
 }
 +static int
 +qemuBuildAsyncTeardownCommandLine(virCommand *cmd,
 +                                  const virDomainDef *def,
 +                                  virQEMUCaps *qemuCaps)
 +{
 +    g_autofree char *async = NULL;
 +    virTristateBool enabled = def->features[VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN];
 +
 +    if (enabled != VIR_TRISTATE_BOOL_ABSENT &&
 +        virQEMUCapsGet(qemuCaps, QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN)) {
 +        async = g_strdup_printf("async-teardown=%s",
 +                                virTristateSwitchTypeToString(enabled));
 +        virCommandAddArgList(cmd, "-run-with", async, NULL);
 +    }
 +
 +    return 0;
 +}
 +
 +
 typedef enum {
     QEMU_COMMAND_DEPRECATION_BEHAVIOR_NONE = 0,
     QEMU_COMMAND_DEPRECATION_BEHAVIOR_OMIT,
@@ -10530,6 +10549,9 @@ qemuBuildCommandLine(virDomainObj *vm,
     if (qemuBuildCryptoCommandLine(cmd, def, qemuCaps) < 0)
         return NULL;
 +    if (qemuBuildAsyncTeardownCommandLine(cmd, def, qemuCaps) < 0)
 +        return NULL;
 +
     if (cfg->logTimestamp)
         virCommandAddArgList(cmd, "-msg", "timestamp=on", NULL);
 diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
 index a53729d349..7e09e2c52f 100644
 --- a/src/qemu/qemu_validate.c
 +++ b/src/qemu/qemu_validate.c
@@ -219,6 +219,15 @@ qemuValidateDomainDefFeatures(const virDomainDef *def,
             }
             break;
 +        case VIR_DOMAIN_FEATURE_ASYNC_TEARDOWN:
 +            if (def->features[i] == VIR_TRISTATE_BOOL_YES &&
 +                !virQEMUCapsGet(qemuCaps, QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN)) {
 +                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
 +                              _("asynchronous teardown is not available with this QEMU binary"));
 +                return -1;
 +            }
 +            break;
 +
         case VIR_DOMAIN_FEATURE_SMM:
         case VIR_DOMAIN_FEATURE_KVM:
         case VIR_DOMAIN_FEATURE_XEN:
 diff --git a/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args b/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args
 new file mode 100644
 index 0000000000..455382f1f0
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/async-teardown.x86_64-latest.args
@@ -0,0 +1,37 @@
 +LC_ALL=C \
 +PATH=/bin \
 +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
 +USER=test \
 +LOGNAME=test \
 +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
 +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 +/usr/bin/qemu-system-x86_64 \
 +-name guest=QEMUGuest1,debug-threads=on \
 +-S \
 +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
 +-accel tcg \
 +-cpu qemu64 \
 +-m size=219136k \
 +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
 +-overcommit mem-lock=off \
 +-smp 1,sockets=1,cores=1,threads=1 \
 +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 +-display none \
 +-no-user-config \
 +-nodefaults \
 +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 +-mon chardev=charmonitor,id=monitor,mode=control \
 +-rtc base=utc \
 +-no-shutdown \
 +-boot strict=on \
 +-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":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \
 +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 +-run-with async-teardown=on \
 +-msg timestamp=on
 diff --git a/tests/qemuxml2argvdata/async-teardown.xml b/tests/qemuxml2argvdata/async-teardown.xml
 new file mode 100644
 index 0000000000..70c1eccc55
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/async-teardown.xml
@@ -0,0 +1,31 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
 +  <memory unit='KiB'>219136</memory>
 +  <currentMemory unit='KiB'>219136</currentMemory>
 +  <vcpu placement='static'>1</vcpu>
 +  <os>
 +    <type arch='x86_64' machine='pc'>hvm</type>
 +    <boot dev='hd'/>
 +  </os>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <features>
 +    <async-teardown enabled='yes'/>
 +  </features>
 +  <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='usb' index='0'/>
 +    <controller type='fdc' index='0'/>
 +    <controller type='ide' index='0'/>
 +    <controller type='pci' index='0' model='pci-root'/>
 +    <memballoon model='virtio'/>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args b/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args
 new file mode 100644
 index 0000000000..57690530a2
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-6.0.0.args
@@ -0,0 +1,35 @@
 +LC_ALL=C \
 +PATH=/bin \
 +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
 +USER=test \
 +LOGNAME=test \
 +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
 +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 +/usr/bin/qemu-system-s390x \
 +-name guest=QEMUGuest1,debug-threads=on \
 +-S \
 +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 +-machine s390-ccw-virtio-6.0,usb=off,dump-guest-core=off,memory-backend=s390.ram \
 +-accel tcg \
 +-cpu qemu \
 +-m size=262144k \
 +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \
 +-overcommit mem-lock=off \
 +-smp 1,sockets=1,cores=1,threads=1 \
 +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
 +-display none \
 +-no-user-config \
 +-nodefaults \
 +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 +-mon chardev=charmonitor,id=monitor,mode=control \
 +-rtc base=utc \
 +-no-shutdown \
 +-boot strict=on \
 +-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 \
 +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 +-msg timestamp=on
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args b/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args
 new file mode 100644
 index 0000000000..96b18b83ce
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown-disabled.s390x-latest.args
@@ -0,0 +1,36 @@
 +LC_ALL=C \
 +PATH=/bin \
 +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
 +USER=test \
 +LOGNAME=test \
 +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
 +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 +/usr/bin/qemu-system-s390x \
 +-name guest=QEMUGuest1,debug-threads=on \
 +-S \
 +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \
 +-accel tcg \
 +-cpu qemu \
 +-m size=262144k \
 +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \
 +-overcommit mem-lock=off \
 +-smp 1,sockets=1,cores=1,threads=1 \
 +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
 +-display none \
 +-no-user-config \
 +-nodefaults \
 +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 +-mon chardev=charmonitor,id=monitor,mode=control \
 +-rtc base=utc \
 +-no-shutdown \
 +-boot strict=on \
 +-device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0000"}' \
 +-chardev pty,id=charconsole0 \
 +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
 +-audiodev '{"id":"audio1","driver":"none"}' \
 +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
 +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 +-run-with async-teardown=off \
 +-msg timestamp=on
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown-disabled.xml b/tests/qemuxml2argvdata/s390-async-teardown-disabled.xml
 new file mode 100644
 index 0000000000..3939be0006
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown-disabled.xml
@@ -0,0 +1,24 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory>262144</memory>
 +  <currentMemory>262144</currentMemory>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
 +  </os>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <features>
 +    <async-teardown enabled='no'/>
 +  </features>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +    </controller>
 +    <console type='pty'>
 +      <target type='virtio'/>
 +    </console>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args b/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args
 new file mode 100644
 index 0000000000..cc7866499f
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.s390x-latest.args
@@ -0,0 +1,36 @@
 +LC_ALL=C \
 +PATH=/bin \
 +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
 +USER=test \
 +LOGNAME=test \
 +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
 +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 +/usr/bin/qemu-system-s390x \
 +-name guest=QEMUGuest1,debug-threads=on \
 +-S \
 +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \
 +-accel tcg \
 +-cpu qemu \
 +-m size=262144k \
 +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \
 +-overcommit mem-lock=off \
 +-smp 1,sockets=1,cores=1,threads=1 \
 +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
 +-display none \
 +-no-user-config \
 +-nodefaults \
 +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 +-mon chardev=charmonitor,id=monitor,mode=control \
 +-rtc base=utc \
 +-no-shutdown \
 +-boot strict=on \
 +-device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0000"}' \
 +-chardev pty,id=charconsole0 \
 +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
 +-audiodev '{"id":"audio1","driver":"none"}' \
 +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
 +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 +-run-with async-teardown=on \
 +-msg timestamp=on
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml b/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml
 new file mode 100644
 index 0000000000..e069cd41ed
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown-no-attrib.xml
@@ -0,0 +1,24 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory>262144</memory>
 +  <currentMemory>262144</currentMemory>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
 +  </os>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <features>
 +    <async-teardown/>
 +  </features>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +    </controller>
 +    <console type='pty'>
 +      <target type='virtio'/>
 +    </console>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err b/tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err
 new file mode 100644
 index 0000000000..aa9a4739cb
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown.s390x-6.0.0.err
@@ -0,0 +1 @@
 +unsupported configuration: asynchronous teardown is not available with this QEMU binary
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args b/tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args
 new file mode 100644
 index 0000000000..cc7866499f
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown.s390x-latest.args
@@ -0,0 +1,36 @@
 +LC_ALL=C \
 +PATH=/bin \
 +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
 +USER=test \
 +LOGNAME=test \
 +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
 +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
 +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
 +/usr/bin/qemu-system-s390x \
 +-name guest=QEMUGuest1,debug-threads=on \
 +-S \
 +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
 +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \
 +-accel tcg \
 +-cpu qemu \
 +-m size=262144k \
 +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":268435456}' \
 +-overcommit mem-lock=off \
 +-smp 1,sockets=1,cores=1,threads=1 \
 +-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
 +-display none \
 +-no-user-config \
 +-nodefaults \
 +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
 +-mon chardev=charmonitor,id=monitor,mode=control \
 +-rtc base=utc \
 +-no-shutdown \
 +-boot strict=on \
 +-device '{"driver":"virtio-serial-ccw","id":"virtio-serial0","devno":"fe.0.0000"}' \
 +-chardev pty,id=charconsole0 \
 +-device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \
 +-audiodev '{"id":"audio1","driver":"none"}' \
 +-device '{"driver":"virtio-balloon-ccw","id":"balloon0","devno":"fe.0.0001"}' \
 +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
 +-run-with async-teardown=on \
 +-msg timestamp=on
 diff --git a/tests/qemuxml2argvdata/s390-async-teardown.xml b/tests/qemuxml2argvdata/s390-async-teardown.xml
 new file mode 100644
 index 0000000000..3291b1ada3
 --- /dev/null
 +++ b/tests/qemuxml2argvdata/s390-async-teardown.xml
@@ -0,0 +1,24 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory>262144</memory>
 +  <currentMemory>262144</currentMemory>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
 +  </os>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <features>
 +    <async-teardown enabled='yes'/>
 +  </features>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +    </controller>
 +    <console type='pty'>
 +      <target type='virtio'/>
 +    </console>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
 index c1bba779b3..9abaa72674 100644
 --- a/tests/qemuxml2argvtest.c
 +++ b/tests/qemuxml2argvtest.c
@@ -2701,6 +2701,13 @@ mymain(void)
     DO_TEST_CAPS_LATEST("crypto-builtin");
 +    DO_TEST_CAPS_LATEST("async-teardown");
 +    DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown", "s390x");
 +    DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown-no-attrib", "s390x");
 +    DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("s390-async-teardown", "s390x", "6.0.0");
 +    DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown-disabled", "s390x");
 +    DO_TEST_CAPS_ARCH_VER("s390-async-teardown-disabled", "s390x", "6.0.0");
 +
     qemuTestDriverFree(&driver);
     virFileWrapperClearPrefixes();
 diff --git a/tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml b/tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml
 new file mode 100644
 index 0000000000..e98308a9b1
 --- /dev/null
 +++ b/tests/qemuxml2xmloutdata/async-teardown.x86_64-latest.xml
@@ -0,0 +1,44 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
 +  <memory unit='KiB'>219136</memory>
 +  <currentMemory unit='KiB'>219136</currentMemory>
 +  <vcpu placement='static'>1</vcpu>
 +  <os>
 +    <type arch='x86_64' machine='pc'>hvm</type>
 +    <boot dev='hd'/>
 +  </os>
 +  <features>
 +    <async-teardown enabled='yes'/>
 +  </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>
 +    <disk type='block' device='disk'>
 +      <driver name='qemu' type='raw'/>
 +      <source dev='/dev/HostVG/QEMUGuest1'/>
 +      <target dev='hda' bus='ide'/>
 +      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
 +    </disk>
 +    <controller type='usb' index='0' model='piix3-uhci'>
 +      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
 +    </controller>
 +    <controller type='fdc' index='0'/>
 +    <controller type='ide' index='0'>
 +      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
 +    </controller>
 +    <controller type='pci' index='0' model='pci-root'/>
 +    <input type='mouse' bus='ps2'/>
 +    <input type='keyboard' bus='ps2'/>
 +    <audio id='1' type='none'/>
 +    <memballoon model='virtio'>
 +      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
 +    </memballoon>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml b/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml
 new file mode 100644
 index 0000000000..a53d4995f0
 --- /dev/null
 +++ b/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-6.0.0.xml
@@ -0,0 +1,36 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory unit='KiB'>262144</memory>
 +  <currentMemory unit='KiB'>262144</currentMemory>
 +  <vcpu placement='static'>1</vcpu>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio-6.0'>hvm</type>
 +    <boot dev='hd'/>
 +  </os>
 +  <features>
 +    <async-teardown enabled='no'/>
 +  </features>
 +  <cpu mode='custom' match='exact' check='none'>
 +    <model fallback='forbid'>qemu</model>
 +  </cpu>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
 +    </controller>
 +    <controller type='pci' index='0' model='pci-root'/>
 +    <console type='pty'>
 +      <target type='virtio' port='0'/>
 +    </console>
 +    <audio id='1' type='none'/>
 +    <memballoon model='virtio'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
 +    </memballoon>
 +    <panic model='s390'/>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml
 new file mode 100644
 index 0000000000..06c890cbff
 --- /dev/null
 +++ b/tests/qemuxml2xmloutdata/s390-async-teardown-disabled.s390x-latest.xml
@@ -0,0 +1,36 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory unit='KiB'>262144</memory>
 +  <currentMemory unit='KiB'>262144</currentMemory>
 +  <vcpu placement='static'>1</vcpu>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
 +    <boot dev='hd'/>
 +  </os>
 +  <features>
 +    <async-teardown enabled='no'/>
 +  </features>
 +  <cpu mode='custom' match='exact' check='none'>
 +    <model fallback='forbid'>qemu</model>
 +  </cpu>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
 +    </controller>
 +    <controller type='pci' index='0' model='pci-root'/>
 +    <console type='pty'>
 +      <target type='virtio' port='0'/>
 +    </console>
 +    <audio id='1' type='none'/>
 +    <memballoon model='virtio'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
 +    </memballoon>
 +    <panic model='s390'/>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml
 new file mode 100644
 index 0000000000..510396a9a8
 --- /dev/null
 +++ b/tests/qemuxml2xmloutdata/s390-async-teardown-no-attrib.s390x-latest.xml
@@ -0,0 +1,36 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory unit='KiB'>262144</memory>
 +  <currentMemory unit='KiB'>262144</currentMemory>
 +  <vcpu placement='static'>1</vcpu>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
 +    <boot dev='hd'/>
 +  </os>
 +  <features>
 +    <async-teardown enabled='yes'/>
 +  </features>
 +  <cpu mode='custom' match='exact' check='none'>
 +    <model fallback='forbid'>qemu</model>
 +  </cpu>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
 +    </controller>
 +    <controller type='pci' index='0' model='pci-root'/>
 +    <console type='pty'>
 +      <target type='virtio' port='0'/>
 +    </console>
 +    <audio id='1' type='none'/>
 +    <memballoon model='virtio'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
 +    </memballoon>
 +    <panic model='s390'/>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml
 new file mode 100644
 index 0000000000..510396a9a8
 --- /dev/null
 +++ b/tests/qemuxml2xmloutdata/s390-async-teardown.s390x-latest.xml
@@ -0,0 +1,36 @@
 +<domain type='qemu'>
 +  <name>QEMUGuest1</name>
 +  <uuid>9aa4b45c-b9dd-45ef-91fe-862b27b4231f</uuid>
 +  <memory unit='KiB'>262144</memory>
 +  <currentMemory unit='KiB'>262144</currentMemory>
 +  <vcpu placement='static'>1</vcpu>
 +  <os>
 +    <type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
 +    <boot dev='hd'/>
 +  </os>
 +  <features>
 +    <async-teardown enabled='yes'/>
 +  </features>
 +  <cpu mode='custom' match='exact' check='none'>
 +    <model fallback='forbid'>qemu</model>
 +  </cpu>
 +  <clock offset='utc'/>
 +  <on_poweroff>destroy</on_poweroff>
 +  <on_reboot>restart</on_reboot>
 +  <on_crash>destroy</on_crash>
 +  <devices>
 +    <emulator>/usr/bin/qemu-system-s390x</emulator>
 +    <controller type='virtio-serial' index='0'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
 +    </controller>
 +    <controller type='pci' index='0' model='pci-root'/>
 +    <console type='pty'>
 +      <target type='virtio' port='0'/>
 +    </console>
 +    <audio id='1' type='none'/>
 +    <memballoon model='virtio'>
 +      <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
 +    </memballoon>
 +    <panic model='s390'/>
 +  </devices>
 +</domain>
 diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
 index 565cb3e1e1..b66274beb8 100644
 --- a/tests/qemuxml2xmltest.c
 +++ b/tests/qemuxml2xmltest.c
@@ -1241,6 +1241,12 @@ mymain(void)
     DO_TEST_CAPS_LATEST("cpu-phys-bits-limit");
     DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate-bare");
 +    DO_TEST_CAPS_LATEST("async-teardown");
 +    DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown", "s390x");
 +    DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown-no-attrib", "s390x");
 +    DO_TEST_CAPS_ARCH_LATEST("s390-async-teardown-disabled", "s390x");
 +    DO_TEST_CAPS_ARCH_VER("s390-async-teardown-disabled", "s390x", "6.0.0");
 +
  cleanup:
     qemuTestDriverFree(&driver);
     virFileWrapperClearPrefixes();
 -- 
 2.41.0
--- a/libvirt-tests-add-capabilities-for-QEMU-8.1.0-on-s390x.patch
+++ b/libvirt-tests-add-capabilities-for-QEMU-8.1.0-on-s390x.patch
--- a/libvirt-tests-remove-acpi-support-from-s390x-ccw-hotplug-tests.patch
+++ b/libvirt-tests-remove-acpi-support-from-s390x-ccw-hotplug-tests.patch
@ -0,0 +1,127 @@
 From b775a84c8e8d95cb407e56b0ee289b124027f94d Mon Sep 17 00:00:00 2001
 Message-ID: <b775a84c8e8d95cb407e56b0ee289b124027f94d.1689974709.git.jdenemar@redhat.com>
 From: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Date: Wed, 5 Jul 2023 08:20:23 +0200
 Subject: [PATCH] tests: remove acpi support from s390x ccw hotplug tests
 In newer QEMU libvirt combinations acpi support is no longer tolerated
 and ignored. Therfore before upgrading the test capabilities to QEMU
 8.1.0 replies removing the acpi feature from the domain XMLs.
 Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
 Reviewed-by: Peter Krempa <pkrempa@redhat.com>
 Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
 (cherry picked from commit d8e95ab6b7c45acc121746e2e24edcfca3d8d8a0)
 Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2168499
 Signed-off-by: Boris Fiuczynski <bfiuczyn@redhat.com>
 ---
 .../qemuhotplug-base-ccw-live+ccw-virtio.xml                     | 1 -
 ...lug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml | 1 -
 ...plug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 1 -
 .../qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml              | 1 -
 ...tplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml | 1 -
 .../qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml   | 1 -
 .../qemuhotplug-base-ccw-live-with-ccw-virtio.xml                | 1 -
 tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml       | 1 -
 8 files changed, 8 deletions(-)
 diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
 index 798a7ab732..6e879ded86 100644
 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
 +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
 index 0c76410ff1..86d8da651d 100644
 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
 +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-explicit.xml
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 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 5d2769c420..9b16951e46 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
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 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 845c0e1c98..b5292a7ed2 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
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 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 29b8fdd6c8..f37868101c 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
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 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 29b8fdd6c8..f37868101c 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
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
 index 82402ffe1b..42f89a07a2 100644
 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
 +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
 index 6eb60b13a9..f0570b5cf4 100644
 --- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
 +++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
@@ -9,7 +9,6 @@
     <boot dev='hd'/>
   </os>
   <features>
 -    <acpi/>
     <apic/>
     <pae/>
   </features>
 -- 
 2.41.0
--- a/libvirt.spec
+++ b/libvirt.spec
@ -229,7 +229,7 @@
 Summary: Library providing a simple virtualization API
 Name: libvirt
 Version: 9.5.0
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
 URL: https://libvirt.org/
@ -241,6 +241,14 @@ Source1: symlinks
 Patch1: libvirt-nodedev-transient-mdev-update-on-nodeDeviceCreateXML.patch
 Patch2: libvirt-nodedev-refactor-mdevctl-thread-functions.patch
 Patch3: libvirt-nodedev-update-mdevs-from-the-mdevctl-thread.patch
 Patch4: libvirt-tests-remove-acpi-support-from-s390x-ccw-hotplug-tests.patch
 Patch5: libvirt-tests-add-capabilities-for-QEMU-8.1.0-on-s390x.patch
 Patch6: libvirt-qemu-add-run-with-async-teardown-capability.patch
 Patch7: libvirt-qemu-allow-use-of-async-teardown-in-domain.patch
 Patch8: libvirt-conf-domcaps-Add-async-teardown-domain-capability.patch
 Patch9: libvirt-qemu-S390-does-not-provide-physical-address-size.patch
 Patch10: libvirt-nodedev-report-mdev-persistence-properly.patch
 Patch11: libvirt-node_device-Don-t-leak-error-message-buffer-from-virMdevctlListDefined-Active.patch
 Requires: libvirt-daemon = %{version}-%{release}
@ -2477,6 +2485,16 @@ exit 0
 %endif
 %changelog
 * Fri Jul 21 2023 Jiri Denemark <jdenemar@redhat.com> - 9.5.0-3
 - tests: remove acpi support from s390x ccw hotplug tests (rhbz#2168499)
 - tests: add capabilities for QEMU 8.1.0 on s390x (rhbz#2168499)
 - qemu: add run-with async-teardown capability (rhbz#2168499)
 - qemu: allow use of async teardown in domain (rhbz#2168499)
 - conf: domcaps: Add 'async-teardown' domain capability (rhbz#2168499)
 - qemu: S390 does not provide physical address size (rhbz#2224016)
 - nodedev: report mdev persistence properly (rhbz#2143158)
 - node_device: Don't leak error message buffer from virMdevctlListDefined|Active (rhbz#2143158)
 * Mon Jul 17 2023 Jiri Denemark <jdenemar@redhat.com> - 9.5.0-2
 - nodedev: transient mdev update on nodeDeviceCreateXML (rhbz#2143158)
 - nodedev: refactor mdevctl thread functions (rhbz#2143158)